Graph and Metrics views bug fixes

1 files changed, 6 insertions, 19 deletions

diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java
index a375e8f1422..7d8c0a3ad39 100644
--- a/java/src/IceGridGUI/LiveDeployment/Service.java
+++ b/java/src/IceGridGUI/LiveDeployment/Service.java
@@ -344,10 +344,11 @@ public class Service extends ListArrayTreeNode
     {
         if(_started)
         {
-            _metricsRetrieved = false;
-            _metrics.clear();
-            rebuild(this);
             _started = false;
+            if(getRoot().getTree().isExpanded(getPath()))
+            {
+                fetchMetricsViewNames();
+            }
             getRoot().getTreeModel().nodeChanged(this);
         }
     }
@@ -480,9 +481,9 @@ public class Service extends ListArrayTreeNode
 
     public void fetchMetricsViewNames()
     {
-        if(!_started || _metricsRetrieved)
+        if(_metricsRetrieved)
         {
-            return; // Already loaded or not started.
+            return; // Already loaded.
         }
         _metricsRetrieved = true;
 
@@ -557,20 +558,6 @@ public class Service extends ListArrayTreeNode
         }
     }
 
-    void rebuild(Service service, boolean fetchMetricsViewNames)
-    {
-        _metrics.clear();
-        rebuild(service);
-        if(fetchMetricsViewNames)
-        {
-            _metricsRetrieved = false;
-            if(getRoot().getTree().isExpanded(getPath()))
-            {
-                fetchMetricsViewNames();
-            }
-        }
-    }
-
     void rebuild(Service service)
     {
         _adapters = service._adapters;