Still working for multiple readers

[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 50c8827efdf73d4cb7e238cac0a169de61462120..c9dfe893433d379b083fa40cbb6a1a559d62024c 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,17 +1,13 @@
 package org.simantics.document.server.request;
 
-import java.util.ArrayList;
-import java.util.Collection;
-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;
-import org.simantics.utils.datastructures.Pair;
+import org.simantics.threadlog.Task;
+import org.simantics.threadlog.ThreadLog;
 
 public class NodeRequest extends VariableRead<JSONObject> {
 
@@ -28,16 +24,27 @@ public class NodeRequest extends VariableRead<JSONObject> {
 
        long s = System.nanoTime();
 
-       JSONObject staticContent = graph.syncRequest(new AttributesRequest(variable));
+               Task task = ThreadLog.BEGIN("NodeRequest " + variable.getURI(graph));
+               
+               try {
 
-       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));
-               }
-       }
+                       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 staticContent;
+       
+               return staticContent;
+
+       } finally {
+               
+               task.end();
+               
+       }
 
     }