From: Hannu Niemistö Date: Thu, 3 Aug 2017 06:48:31 +0000 (+0300) Subject: Merge "PropertyMap.get does not return null if there is no mapping for the key" X-Git-Tag: v1.31.0~264^2~8 X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=d80b82a0c48b42604258ee1dc22cd8cf0bbcbb8e;hp=b77d6bc2e8713d4138a0af0afb64a97f92a21052 Merge "PropertyMap.get does not return null if there is no mapping for the key" --- diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/AbstractVariable.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/AbstractVariable.java index 3d527e039..d9366b132 100644 --- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/AbstractVariable.java +++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/AbstractVariable.java @@ -302,7 +302,7 @@ public abstract class AbstractVariable implements Variable { if(Variables.TYPE.equals(key)) return getTypeVariable(); else if(Variables.URI.equals(key)) return getURIVariable(); - return variable; + return null; } }