diff options
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/Server.java')
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/Server.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java index 5fe1dc56701..8a5ad3cc9c2 100755 --- a/java/src/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/LiveDeployment/Server.java @@ -650,7 +650,7 @@ class Server extends ListArrayTreeNode java.util.Set serverTemplates) { if(variablesChanged || - (_instanceDescriptor != null && serverTemplates.contains(_instanceDescriptor.template))) + (_instanceDescriptor != null && serverTemplates != null && serverTemplates.contains(_instanceDescriptor.template))) { if(_instanceDescriptor != null) { @@ -663,6 +663,11 @@ class Server extends ListArrayTreeNode _resolver.put("server", _id); _serverDescriptor = (ServerDescriptor)templateDescriptor.descriptor; } + else + { + _resolver.reset(resolver); + _resolver.put("server", _id); + } _adapters.clear(); createAdapters(); @@ -674,7 +679,7 @@ class Server extends ListArrayTreeNode getRoot().getTreeModel().nodeStructureChanged(this); } - else if(serviceTemplates.size() > 0 && _serverDescriptor instanceof IceBoxDescriptor) + else if(serviceTemplates != null && serviceTemplates.size() > 0 && _serverDescriptor instanceof IceBoxDescriptor) { _services.clear(); _servicePropertySets.clear(); |