1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index c67bfc95bfd..b63a1451af7 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -92,7 +92,12 @@ public class Instance
         return _defaultHost;
     }
 
-    public synchronized BufferManager
+    //
+    // TODO: This should be synchronized, but it causes a deadlock
+    // on shutdown if a BasicStream is created while the Instance
+    // is already locked (e.g., in ThreadPool)
+    //
+    public /*synchronized*/ BufferManager
     bufferManager()
     {
         return _bufferManager;