# HG changeset patch
# User xlu
# Date 1231877678 28800
# Node ID 9250583801d24030cc7e620d40cc5bb83fc4c2df
# Parent  fc7ab6287598874e544d40e03c3acb3869f796f8# Parent  4db4e58c16bd5a55fcbd4be1eabf368c05537b67
Merge

diff -r fc7ab6287598 -r 9250583801d2 src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Fri Jan 09 14:39:07 2009 -0500
+++ b/src/share/vm/prims/jni.cpp	Tue Jan 13 12:14:38 2009 -0800
@@ -2691,8 +2691,13 @@
 
     directBufferSupportInitializeEnded = 1;
   } else {
-    ThreadInVMfromNative tivn(thread); // set state as yield_all can call os:sleep
     while (!directBufferSupportInitializeEnded && !directBufferSupportInitializeFailed) {
+      // Set state as yield_all can call os:sleep. On Solaris, yield_all calls
+      // os::sleep which requires the VM state transition. On other platforms, it
+      // is not necessary. The following call to change the VM state is purposely
+      // put inside the loop to avoid potential deadlock when multiple threads
+      // try to call this method. See 6791815 for more details.
+      ThreadInVMfromNative tivn(thread);
       os::yield_all();
     }
   }