Fixed ICE-4921 - IceBox service icon still shows the running icon when IceBox server is down

2 files changed, 11 insertions, 3 deletions

diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java
index 6db270aba57..6bc4eb1f5ce 100644
--- a/java/src/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/LiveDeployment/Server.java
@@ -995,7 +995,6 @@ public class Server extends ListArrayTreeNode
                                     JOptionPane.ERROR_MESSAGE);
                             }
                         }
-
                     }
 
                     if(_serviceObserver != null)
@@ -1044,6 +1043,13 @@ public class Server extends ListArrayTreeNode
                         }
                     }
                 }
+                else if(_state == ServerState.Inactive)
+                {
+                    for(Service service: _services)
+                    {
+                        service.stopped();
+                    }
+                }
             }
             else if(_state == null || _state == ServerState.Inactive)
             {
diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java
index 8d73709eb29..12c01535566 100644
--- a/java/src/IceGridGUI/LiveDeployment/Service.java
+++ b/java/src/IceGridGUI/LiveDeployment/Service.java
@@ -345,9 +345,11 @@ public class Service extends ListArrayTreeNode
         if(_started)
         {
             _started = false;
-            if(getRoot().getTree().isExpanded(getPath()))
+            _metricsRetrieved = false;
+            if(!_metrics.isEmpty())
             {
-                fetchMetricsViewNames();
+                _metrics.clear();
+                rebuild(this);
             }
             getRoot().getTreeModel().nodeChanged(this);
         }