fix for deadlock

1 files changed, 18 insertions, 11 deletions

diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 6bfce8c7647..6275fe86b7d 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -180,30 +180,37 @@ public abstract class Application
             _done = false;
         }
 
-        public synchronized void
+        public void
         run()
         {
-            communicator().shutdown();
-            while(!_done)
+            synchronized(_doneMutex)
             {
-                try
-                {
-                    wait();
-                }
-                catch(InterruptedException ex)
+                communicator().shutdown();
+                while(!_done)
                 {
+                    try
+                    {
+                        _doneMutex.wait();
+                    }
+                    catch(InterruptedException ex)
+                    {
+                    }
                 }
             }
         }
 
-        synchronized void
+        void
         done()
         {
-            _done = true;
-            notify();
+            synchronized(_doneMutex)
+            {
+                _done = true;
+                _doneMutex.notify();
+            }
         }
 
         private boolean _done;
+        private java.lang.Object _doneMutex = new java.lang.Object();
     }
 
     private static String _appName;