diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-12-19 23:05:58 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-12-19 23:05:58 +0000 |
| commit | d9abf6d53d02b7c41f86327ab21302406a1d2575 (patch) | |
| tree | b7b0d4b603a68057c994bfe32ddce3c4ca3876ce /java/src/IceGridGUI/LiveDeployment/Server.java | |
| parent | Added Ice.Logger.DateFormat property (diff) | |
| download | ice-d9abf6d53d02b7c41f86327ab21302406a1d2575.tar.bz2 ice-d9abf6d53d02b7c41f86327ab21302406a1d2575.tar.xz ice-d9abf6d53d02b7c41f86327ab21302406a1d2575.zip | |
Added support for node variables
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(); |