Fixed IceGridGUI bug where service metrics were missing (fixes #1203) (#1204)

3 files changed, 38 insertions, 37 deletions

diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java
index 915714180a0..d5a8992440a 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java
@@ -154,7 +154,7 @@ abstract public class Communicator extends TreeNode
             provideAdmin(prefix, (admin) ->
                 {
                     final com.zeroc.Ice.LoggerAdminPrx loggerAdmin =
-                        com.zeroc.Ice.LoggerAdminPrx.uncheckedCast(admin.ice_facet("Logger"));
+                        com.zeroc.Ice.LoggerAdminPrx.uncheckedCast(getAdminFacet(admin, "Logger"));
                     final String title = getDisplayName() + " Ice log";
                     final String defaultFileName = getDefaultFileName();
 
@@ -193,7 +193,7 @@ abstract public class Communicator extends TreeNode
         provideAdmin(prefix, (admin) ->
             {
                 final com.zeroc.Ice.PropertiesAdminPrx propertiesAdmin =
-                    com.zeroc.Ice.PropertiesAdminPrx.uncheckedCast(admin.ice_facet("Properties"));
+                    com.zeroc.Ice.PropertiesAdminPrx.uncheckedCast(getAdminFacet(admin, "Properties"));
 
                 propertiesAdmin.getPropertiesForPrefixAsync("").whenComplete((result, ex) ->
                     {
@@ -230,7 +230,7 @@ abstract public class Communicator extends TreeNode
         if(!provideAdmin(prefix, (admin) ->
             {
                 final com.zeroc.IceMX.MetricsAdminPrx metricsAdmin =
-                    com.zeroc.IceMX.MetricsAdminPrx.uncheckedCast(admin.ice_facet("Metrics"));
+                    com.zeroc.IceMX.MetricsAdminPrx.uncheckedCast(getAdminFacet(admin, "Metrics"));
 
                 metricsAdmin.getMetricsViewNamesAsync().whenComplete((result, ex) ->
                     {
@@ -284,6 +284,10 @@ abstract public class Communicator extends TreeNode
     }
 
     protected abstract java.util.concurrent.CompletableFuture<com.zeroc.Ice.ObjectPrx> getAdminAsync();
+    protected com.zeroc.Ice.ObjectPrx getAdminFacet(com.zeroc.Ice.ObjectPrx admin, String facet)
+    {
+        return admin != null ? admin.ice_facet(facet) : null;
+    }
     protected abstract String getDisplayName();
     protected String getServerDisplayName()
     {
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java
index 628f0c0b3ce..0bc9900152c 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java
@@ -776,8 +776,7 @@ public class Server extends Communicator
                         // Note that duplicate registrations are ignored
                         //
 
-                        com.zeroc.IceBox.ServiceManagerPrx serviceManager =
-                            com.zeroc.IceBox.ServiceManagerPrx.uncheckedCast(getAdminFacet("IceBox.ServiceManager"));
+                        com.zeroc.IceBox.ServiceManagerPrx serviceManager = getServiceManager();
 
                         if(serviceManager != null)
                         {
@@ -1022,17 +1021,9 @@ public class Server extends Communicator
         return null;
     }
 
-    com.zeroc.Ice.ObjectPrx getAdminFacet(String facet)
+    com.zeroc.IceBox.ServiceManagerPrx getServiceManager()
     {
-        com.zeroc.Ice.ObjectPrx admin = getAdmin();
-        if(admin != null)
-        {
-            return admin.ice_facet(facet);
-        }
-        else
-        {
-            return null;
-        }
+        return com.zeroc.IceBox.ServiceManagerPrx.uncheckedCast(getAdminFacet(getAdmin(), "IceBox.ServiceManager"));
     }
 
     static private String toolTip(ServerState state, int pid, boolean enabled)
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java
index cba3f0fcc10..ddba4de17a0 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java
@@ -53,8 +53,7 @@ public class Service extends Communicator
     @Override
     public void start()
     {
-        com.zeroc.IceBox.ServiceManagerPrx serviceManager = com.zeroc.IceBox.ServiceManagerPrx.uncheckedCast(
-            ((Server)_parent).getAdminFacet("IceBox.ServiceManager"));
+        com.zeroc.IceBox.ServiceManagerPrx serviceManager = ((Server)_parent).getServiceManager();
 
         if(serviceManager != null)
         {
@@ -85,8 +84,7 @@ public class Service extends Communicator
     @Override
     public void stop()
     {
-        com.zeroc.IceBox.ServiceManagerPrx serviceManager = com.zeroc.IceBox.ServiceManagerPrx.uncheckedCast(
-            ((Server)_parent).getAdminFacet("IceBox.ServiceManager"));
+        com.zeroc.IceBox.ServiceManagerPrx serviceManager = ((Server)_parent).getServiceManager();
 
         if(serviceManager != null)
         {
@@ -245,6 +243,32 @@ public class Service extends Communicator
     }
 
     @Override
+    protected com.zeroc.Ice.ObjectPrx getAdminFacet(com.zeroc.Ice.ObjectPrx admin, String facet)
+    {
+        String facetName = "IceBox.Service." + _id + "." + facet;
+
+        try
+        {
+            if(Integer.valueOf(((Server)_parent).getProperties().get("IceBox.UseSharedCommunicator." + _id)) > 0)
+            {
+                facetName = "IceBox.SharedCommunicator." + facet;
+            }
+        }
+        catch(NumberFormatException ex)
+        {
+        }
+
+        if (admin != null)
+        {
+            return admin.ice_facet(facetName);
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    @Override
     protected String getServerDisplayName()
     {
         return "Server " + _parent.getId();
@@ -262,24 +286,6 @@ public class Service extends Communicator
         return _parent.getId() + "-" + _id;
     }
 
-    com.zeroc.Ice.ObjectPrx getAdminFacet(String facet)
-    {
-        String facetName = "IceBox.Service." + _id + "." + facet;
-
-        try
-        {
-            if(Integer.valueOf(((Server)_parent).getProperties().get("IceBox.UseSharedCommunicator." + _id)) > 0)
-            {
-                facetName = "IceBox.SharedCommunicator." + facet;
-            }
-        }
-        catch(NumberFormatException ex)
-        {
-        }
-
-        return ((Server)_parent).getAdminFacet(facetName);
-    }
-
     Service(Server parent, String serviceName, Utils.Resolver resolver, ServiceInstanceDescriptor descriptor,
             ServiceDescriptor serviceDescriptor, PropertySetDescriptor serverInstancePSDescriptor)
     {