X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionImplSocket.java;fp=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionImplSocket.java;h=8bbccd080512af308765c0a15c1a413526c5acf1;hb=1e957fc9da518f3bef8a2c19cad72772087e1b6a;hp=92ffc4e739ec2ef8fd994c2cb96c5cfe9726fc8d;hpb=1cb58fb59cd64891c682a7e7b04e00af9e3be575;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
index 92ffc4e73..8bbccd080 100644
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
@@ -89,6 +89,7 @@ import org.simantics.db.impl.graph.WriteSupport;
 import org.simantics.db.impl.internal.RandomAccessValueSupport;
 import org.simantics.db.impl.procedure.ResultCallWrappedQueryProcedure4;
 import org.simantics.db.impl.procedure.ResultCallWrappedSingleQueryProcedure4;
+import org.simantics.db.impl.query.QueryCache;
 import org.simantics.db.impl.query.QueryProcessor;
 import org.simantics.db.impl.query.QueryProcessor.SessionRead;
 import org.simantics.db.impl.query.QueryProcessor.SessionTask;
@@ -1512,7 +1513,8 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                     if (listener != null) {
 
                     	try {
-                    		newGraph.processor.query(newGraph, request, null, new AsyncProcedure<T>() {
+                    		
+                    		AsyncProcedure ap = new AsyncProcedure<T>() {
 
                     			@Override
                     			public void exception(AsyncReadGraph graph, Throwable t) {
@@ -1530,7 +1532,10 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                     				procedure.execute(graph, t);
                     			}
 
-                    		}, listener);
+                    		};
+                    		
+                    		QueryCache.runnerReadEntry(newGraph, request, null, listener, ap);
+                    		
                     	} catch (Throwable t) {
                     	    // This is handled by the AsyncProcedure
                     		//Logger.defaultLogError("Internal error", t);
@@ -1624,7 +1629,8 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                     if (listener != null) {
 
                         try {
-							newGraph.processor.query(newGraph, request, null, procedure, listener);
+                        	QueryCache.runnerAsyncReadEntry(newGraph, request, null, listener, procedure);
+							//newGraph.processor.query(newGraph, request, null, procedure, listener);
 						} catch (DatabaseException e) {
 							Logger.defaultLogError(e);
 						}