Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.document.server / src / org / simantics / document / server / request / NodesRequest2.java

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodesRequest2.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodesRequest2.java
index 605633012382be41f677f01102b0eb61516d58d0..0f57a01c03f2cfc87ff34c9f3a1339fa9dbe9d52 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodesRequest2.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodesRequest2.java
@@ -1,56 +1,49 @@
-package org.simantics.document.server.request;\r
-\r
-import gnu.trove.set.hash.THashSet;\r
-\r
-import java.util.Collections;\r
-import java.util.Set;\r
-\r
-import org.simantics.databoard.Bindings;\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.request.VariableRead;\r
-import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.document.base.ontology.DocumentationResource;\r
-\r
-public class NodesRequest2 extends VariableRead<Set<Variable>> {\r
-\r
-    public NodesRequest2(Variable var) {\r
-        super(var);\r
-       }\r
-\r
-       @Override\r
-       public Set<Variable> perform(ReadGraph graph) throws DatabaseException {\r
-           \r
-               long s = System.nanoTime();\r
-               \r
-               DocumentationResource DOC = DocumentationResource.getInstance(graph);\r
-\r
-               Resource type = variable.getPossibleType(graph);\r
-               if(type == null) return Collections.emptySet();\r
-               \r
-               if(!graph.isInheritedFrom(type, DOC.Components_Component)) return Collections.emptySet();\r
-\r
-               Boolean pathExists = variable.getPossiblePropertyValue(graph, DOC.Properties_pathExists, Bindings.BOOLEAN);\r
-               if(pathExists != null && !pathExists) return Collections.emptySet();\r
-\r
-               if(graph.isInheritedFrom(type, DOC.Components_PrimitiveComponent)) {\r
-                       return Collections.singleton(variable);\r
-               } else {\r
-                       Set<Variable> result = new THashSet<Variable>();\r
-                       for(Variable child : variable.getChildren(graph)) {\r
-                               Set<Variable> nodes = graph.syncRequest(new NodesRequest2(child));\r
-                               result.addAll(nodes);\r
-                       }\r
-\r
-               if(DocumentRequest.PROFILE) {\r
-                       long dura = System.nanoTime()-s;\r
-                       System.err.println("NodesRequest2 " + System.identityHashCode(this) + " " + variable.getURI(graph) + " in " + 1e-6*dura + "ms.");\r
-               }\r
-               \r
-                       return result;\r
-               }\r
-\r
-       }\r
-\r
+package org.simantics.document.server.request;
+
+import gnu.trove.set.hash.THashSet;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.request.VariableRead;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.document.base.ontology.DocumentationResource;
+
+public class NodesRequest2 extends VariableRead<Set<Variable>> {
+
+    public NodesRequest2(Variable var) {
+        super(var);
+       }
+
+       @Override
+       public Set<Variable> perform(ReadGraph graph) throws DatabaseException {
+           
+               DocumentationResource DOC = DocumentationResource.getInstance(graph);
+
+               Resource type = variable.getPossibleType(graph);
+               if(type == null) return Collections.emptySet();
+               
+               if(!graph.isInheritedFrom(type, DOC.Components_Component)) return Collections.emptySet();
+
+               Boolean pathExists = variable.getPossiblePropertyValue(graph, DOC.Properties_pathExists, Bindings.BOOLEAN);
+               if(pathExists != null && !pathExists) return Collections.emptySet();
+
+               if(graph.isInheritedFrom(type, DOC.Components_PrimitiveComponent)) {
+                       return Collections.singleton(variable);
+               } else {
+                       Set<Variable> result = new THashSet<Variable>();
+                       for(Variable child : variable.getChildren(graph)) {
+                               Set<Variable> nodes = graph.syncRequest(new NodesRequest2(child));
+                               result.addAll(nodes);
+                       }
+               
+                       return result;
+               }
+
+       }
+
 }
\ No newline at end of file