diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java index cb941fd5b..587f812d5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java @@ -56,14 +56,16 @@ public class EndpointDescriptionPropertiesUtil { } public static List<String> getStringPlusProperty(Map<String, ?> properties, String key) { + if (properties == null) + return Collections.EMPTY_LIST; + Object value = properties.get(key); - if (value == null) { + + if (value == null) return Collections.EMPTY_LIST; - } - if (value instanceof String) { + if (value instanceof String) return Collections.singletonList((String) value); - } if (value instanceof String[]) { String[] values = (String[]) value; |