Multiple readers and variable optimization

[simantics/platform.git] / bundles / org.simantics.document.swt.core / src / org / simantics / document / swt / core / widget / ComboWidget.java

diff --git a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ComboWidget.java b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ComboWidget.java
index e013ef02531e1be08aa0230b1380f15cddf58c4f..516b9a15c5df84c4dc44d7a0ac32e24fb6191c72 100644 (file)
--- a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ComboWidget.java
+++ b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ComboWidget.java
@@ -20,6 +20,7 @@ public class ComboWidget extends LeafWidgetManager<Combo> {
        private ModifyListener modifyListener = null;
 
        private StringList extractAvailable(Object o) {
+               if(o == null) return new StringList(new String[0]);
                if(o instanceof StringList) return (StringList)o;
                if(o instanceof List) return new StringList((List)o);
                if(o instanceof String[]) return new StringList((String[])o);