Improved stopping of Ice log dialog

4 files changed, 23 insertions, 12 deletions

diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Node.java
index 3cfbb4a003a..3b20f645d1b 100644..100755
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Node.java
+++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Node.java
@@ -643,7 +643,7 @@ class Node extends ListTreeNode
         
         if(_showIceLogDialog != null)
         {
-            _showIceLogDialog.stop();
+            _showIceLogDialog.stopped();
         }
 
         if(_children.isEmpty())
@@ -659,6 +659,7 @@ class Node extends ListTreeNode
             }
 
             getRoot().getTreeModel().nodeChanged(this);
+
             return false;
         }
     }
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Server.java
index ce790055380..6f31158974d 100644..100755
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Server.java
@@ -964,7 +964,7 @@ public class Server extends ListArrayTreeNode
             {
                 if(_showIceLogDialog != null)
                 {
-                    _showIceLogDialog.stop();
+                    _showIceLogDialog.stopped();
                 }
             }
 
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Service.java
index 6a2de665305..51da4ae0211 100644..100755
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Service.java
+++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/Service.java
@@ -341,7 +341,7 @@ public class Service extends ListArrayTreeNode
     {
         if(_showIceLogDialog != null)
         {
-            _showIceLogDialog.stop();
+            _showIceLogDialog.stopped();
         }
     }
     
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java
index 23f0d6b1661..0cf3c2f7069 100644..100755
--- a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java
+++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java
@@ -374,7 +374,6 @@ class ShowIceLogDialog extends JDialog
         
         private synchronized void stop()
         {
-            assert(!_destroyed);
             _destroyed = true;
         }
         
@@ -682,7 +681,7 @@ class ShowIceLogDialog extends JDialog
                         public void run()
                         {
                             _parent.getRoot().failure(prefix, errorTitle, ex.toString());
-                            stop(false);
+                            stopped();
                         }
                     });
                 }
@@ -696,7 +695,7 @@ class ShowIceLogDialog extends JDialog
                         public void run()
                         {
                             _parent.getRoot().failure(prefix, errorTitle, ex.toString());
-                            stop(false);
+                            stopped();
                         }
                     });
                 }
@@ -709,7 +708,7 @@ class ShowIceLogDialog extends JDialog
             catch(LocalException ex)
             {
                 _parent.getRoot().failure(prefix, errorTitle, ex.toString());
-                stop(false);
+                stopped();
             }
         }
         else
@@ -759,14 +758,20 @@ class ShowIceLogDialog extends JDialog
                     _parent.getRoot().success(prefix, ex.ice_name());
                 }
             }
-            
+        }
+
+        if(_remoteLogger != null)
+        {
             _remoteLogger.stop();
-            _parent.getRoot().getCoordinator().removeCallback(_remoteLoggerPrx.ice_getIdentity().name, "");
-            
             _remoteLogger = null;
+        }
+
+        if(_remoteLoggerPrx != null)
+        {
+            _parent.getRoot().getCoordinator().removeCallback(_remoteLoggerPrx.ice_getIdentity().name, "");
             _remoteLoggerPrx = null;
         }
-        
+
         _stopItem.setSelected(true);
         _stopButton.setSelected(true);
         _pause.setEnabled(false);
@@ -826,7 +831,12 @@ class ShowIceLogDialog extends JDialog
     {
         stop(true);
     }
-    
+
+    void stopped()
+    {
+        stop(false);
+    }
+
     void close(boolean notifyRoot)
     {
         stop();