Fix deadlock on some jdks between write and close by synchronizing sh…

…utdown using the sendMutex_ already used for send
apache · May 26, 2015 · 7ddcd03 · 7ddcd03
1 parent d33611d
commit 7ddcd03
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java b/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java
@@ -288,8 +288,12 @@ public void execShutdown() {
 
         // 
         // shutdown the transport
+        // synchronization on sendMutex_ is needed to avoid a deadlock in some oracle and ibm jdks between send and shutdown
+        // https://bugs.openjdk.java.net/browse/JDK-8013809 deadlock in SSLSocketImpl between between write and close 
         // 
-        transport_.shutdown();
+        synchronized (sendMutex_) {
+            transport_.shutdown();
+        }
 
         //
         // Shutdown the receiver threads. There may not be a receiver