Fixed bug #2499

1 files changed, 13 insertions, 6 deletions

diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java
index 571e4d823b8..91a7a916afb 100755
--- a/java/src/IceGridGUI/Application/Communicator.java
+++ b/java/src/IceGridGUI/Application/Communicator.java
@@ -679,18 +679,18 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
             ServiceInstanceDescriptor descriptor = (ServiceInstanceDescriptor)o;
 
             if(descriptor.descriptor == null)
-            {
-                TemplateDescriptor templateDescriptor 
-                    = getRoot().findServiceTemplateDescriptor(descriptor.template);
-                
-                assert templateDescriptor != null;
-                
+            { 
                 String serviceName = null;
                 String displayString = null;
                 Utils.Resolver serviceResolver = null;
 
                 if(Communicator.this instanceof PlainServer)
                 {
+                    TemplateDescriptor templateDescriptor 
+                        = getRoot().findServiceTemplateDescriptor(descriptor.template);
+                    
+                    assert templateDescriptor != null;
+
                     serviceResolver = new Utils.Resolver(getResolver(), 
                                                          descriptor.parameterValues,
                                                          templateDescriptor.parameterDefaults);
@@ -863,6 +863,8 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
 
     void removeServiceInstances(String template)
     {   
+        boolean updated = false;
+
         java.util.Iterator p = _services.iterator();
         while(p.hasNext())
         {
@@ -877,9 +879,14 @@ abstract class Communicator extends TreeNode implements DescriptorHolder
                     p.remove();
                     _services.removeDescriptor(d);
                     getEnclosingEditable().markModified();
+                    updated = true;
                 }
             }
         }
+        if(updated)
+        {
+            getRoot().getTreeModel().nodeStructureChanged(this);
+        }
     }
 
     void removeSortedChildren(String[] childIds, java.util.List fromChildren)