Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2018-03-17 17:27:56 -0400
committerslewis2018-03-17 17:27:56 -0400
commitf5a761d4aa80c463c9949f3360a9c4ec94b508e4 (patch)
tree2145760089cb28125574f522c23208756ab4bf07 /framework
parent98c24554dbe2ac2434c7e01d500c6e64d9c48c96 (diff)
downloadorg.eclipse.ecf-f5a761d4aa80c463c9949f3360a9c4ec94b508e4.tar.gz
org.eclipse.ecf-f5a761d4aa80c463c9949f3360a9c4ec94b508e4.tar.xz
org.eclipse.ecf-f5a761d4aa80c463c9949f3360a9c4ec94b508e4.zip
Additional fixes for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205 Change-Id: I0000000000000000000000000000000000000000
Diffstat (limited to 'framework')
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java10
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;

Back to the top