diff options
| author | Jose <jose@zeroc.com> | 2013-08-26 22:21:17 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-08-26 22:21:17 +0200 |
| commit | 256e1ee3bf33361375744435a734ddb2863086e7 (patch) | |
| tree | a524b76331761367fcf3134c6203f8ffc5ee9dcf /java/src/IceGridGUI/Application/Adapter.java | |
| parent | minor fix (diff) | |
| download | ice-256e1ee3bf33361375744435a734ddb2863086e7.tar.bz2 ice-256e1ee3bf33361375744435a734ddb2863086e7.tar.xz ice-256e1ee3bf33361375744435a734ddb2863086e7.zip | |
Fixed (ICE-5406) - IceGridGUI save to file NPE
Diffstat (limited to 'java/src/IceGridGUI/Application/Adapter.java')
| -rw-r--r-- | java/src/IceGridGUI/Application/Adapter.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java index 2b4f21cf2ac..fda47c0c42e 100644 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/Application/Adapter.java @@ -167,8 +167,18 @@ class Adapter extends TreeNode implements DescriptorHolder attributes.add(createAttribute("name", _descriptor.name)); String oaPrefix = _descriptor.name + "."; - attributes.add(createAttribute("endpoints", getProperty(oaPrefix + "Endpoints"))); - attributes.add(createAttribute("proxy-options", getProperty(oaPrefix + "ProxyOptions"))); + String value = getProperty(oaPrefix + "Endpoints"); + if(value != null && value.length() > 0) + { + attributes.add(createAttribute("endpoints", value)); + } + + value = getProperty(oaPrefix + "ProxyOptions"); + if(value != null && value.length() > 0) + { + attributes.add(createAttribute("proxy-options", value)); + } + attributes.add(createAttribute("id", _descriptor.id)); if(_descriptor.registerProcess) { |