diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-12-15 14:47:31 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-12-15 14:47:31 +0000 |
| commit | 1560148aa215bf9b91df359d368fdbd77cc1bcb4 (patch) | |
| tree | 98f1431848a2d8bf5d4a05a6b960017d37822d2b /java/src | |
| parent | Changing IceSSL assembly filename from icecsssl to icesslcs. (diff) | |
| download | ice-1560148aa215bf9b91df359d368fdbd77cc1bcb4.tar.bz2 ice-1560148aa215bf9b91df359d368fdbd77cc1bcb4.tar.xz ice-1560148aa215bf9b91df359d368fdbd77cc1bcb4.zip | |
Fixed bug #1559
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Server.java | 6 |
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)); } |