Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
index 71b66a76ba8ea32f9909e5785b0c89a279fd39d8..8d96c4798cb59e0947bda57879f9019915afae39 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequest.java
@@ -1,58 +1,35 @@
 package org.simantics.document.server.request;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.simantics.db.ReadGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.request.VariableRead;
 import org.simantics.db.layer0.variable.Variable;
+import org.simantics.document.server.DocumentServerUtils.AttributesRequest;
 import org.simantics.document.server.JSONObject;
 
 public class NodeRequest extends VariableRead<JSONObject> {
-    
-    public static String ERRORS = "Errors";
 
-       public NodeRequest(Variable node) {
-               super(node);
-       }
+    public static final String ERRORS = "Errors";
+    public static final String PROPERTY_VALUE_EXCEPTIONS = "_PropertyValueExceptions";
+
+    public NodeRequest(Variable node) {
+        super(node);
+    }
 
-       @SuppressWarnings("unchecked")
     @Override
-       public JSONObject perform(ReadGraph graph) throws DatabaseException {
-               
-               long s = System.nanoTime();
-
-           JSONObject staticContent = graph.syncRequest(new NodeRequestStatic(variable));
-           Map<String,Object> dynamicContent = graph.syncRequest(new NodeRequestDynamic(variable));
-           
-           if(dynamicContent.isEmpty()) {
-               return staticContent;
-           }
-           
-        JSONObject result = staticContent.clone();
-        result.add(dynamicContent);
-
-        if(dynamicContent.containsKey(ERRORS) || staticContent.getJSONField(ERRORS) != null) {
-            ArrayList<String> errorList = new ArrayList<String>();
-            
-            if(dynamicContent.containsKey(ERRORS))
-                errorList.addAll((List<String>)dynamicContent.get(ERRORS));
-            
-            if(staticContent.getJSONField(ERRORS) != null)
-                errorList.addAll((List<String>)staticContent.getJSONField(ERRORS));
-            
-            result.addJSONField(ERRORS, errorList);
-        }
-        
-        if(DocumentRequest.PROFILE) {
-               long dura = System.nanoTime()-s;
-               System.err.println("NodeRequest " + System.identityHashCode(this) + " " + variable.getURI(graph) + " in " + 1e-6*dura + "ms." + result);
+    public JSONObject perform(ReadGraph graph) throws DatabaseException {
+        long s = DocumentRequest.PROFILE ? System.nanoTime() : 0L;
+
+        JSONObject staticContent = graph.syncRequest(new AttributesRequest(variable));
+
+        if (DocumentRequest.PROFILE) {
+            long dura = System.nanoTime()-s;
+            if (dura > DocumentRequest.PROFILE_THRESHOLD_NODEREQUEST * 1e3) {
+                System.err.println("NodeRequest " + System.identityHashCode(this) + " in " + 1e-6*dura + "ms. " + variable.getURI(graph));
+            }
         }
-        
-           return result;
 
-       }               
+        return staticContent;
+    }
 
-}
\ No newline at end of file
+}