summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/LiveDeployment/Server.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Server.java')
-rwxr-xr-xjava/src/IceGridGUI/LiveDeployment/Server.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java
index af7af717e55..6c8f524f7ba 100755
--- a/java/src/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/LiveDeployment/Server.java
@@ -797,7 +797,6 @@ class Server extends ListArrayTreeNode
private void createService(ServiceInstanceDescriptor descriptor)
{
ServiceDescriptor serviceDescriptor = null;
- PropertySetDescriptor serverInstancePSDescriptor = null;
String serviceName = null;
Utils.Resolver serviceResolver = null;
@@ -816,8 +815,6 @@ class Server extends ListArrayTreeNode
templateDescriptor.parameterDefaults);
serviceName = serviceResolver.substitute(serviceDescriptor.name);
serviceResolver.put("service", serviceName);
-
- serverInstancePSDescriptor = (PropertySetDescriptor)_servicePropertySets.get(serviceName);
}
else
{
@@ -829,6 +826,9 @@ class Server extends ListArrayTreeNode
serviceResolver.put("service", serviceName);
}
+ PropertySetDescriptor serverInstancePSDescriptor =
+ (PropertySetDescriptor)_servicePropertySets.get(serviceName);
+
_services.add(new Service(this, serviceName, serviceResolver,
descriptor, serviceDescriptor, serverInstancePSDescriptor));
}