Multiple readers and variable optimization

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / variable / VariableMapImpl.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/VariableMapImpl.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/VariableMapImpl.java
index 5b6aa082001a4ae2be5f0547c3e983db9569c508..52ecbc705774b8fa1edc75d2da34923b0129778f 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/VariableMapImpl.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/VariableMapImpl.java
@@ -18,9 +18,9 @@ abstract public class VariableMapImpl implements VariableMap {
        public Map<String, Variable> getVariables(ReadGraph graph, Variable context, String classification, Map<String, Variable> map) throws DatabaseException {
                
        Map<String,Variable> all = getVariables(graph, context, null);
-       if(all.isEmpty()) return all;
+    
+       for(Map.Entry<String, Variable> entry : all.entrySet()) {       if(all.isEmpty()) return all;
        
-       for(Map.Entry<String, Variable> entry : all.entrySet()) {
                Set<String> classifications = entry.getValue().getClassifications(graph);
                if(classifications.contains(classification)) {
                        if(map == null) map = new HashMap<String,Variable>();