X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FAsyncMultiReadEntry.java;h=7880448078dc0f7edb48701c4de7d9bac52e9fec;hb=HEAD;hp=24f8e5375f65660a41e08396e97a393b5ce4b5b1;hpb=0d9b90834ce56b292c00b1a39850ed842c3e4d42;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
index 24f8e5375..788044807 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
@@ -27,26 +27,26 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase<AsyncMultiProce
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AsyncMultiReadEntry.class);
 
-    protected AsyncMultiRead<T> request;
+    protected AsyncMultiRead<T> id;
     
     AsyncMultiReadEntry(AsyncMultiRead<T> request) {
-    	this.request = request;
+    	this.id = request;
     }
     
     @Override
     int makeHash() {
-    	return request.hashCode();
+    	return id.hashCode();
     }
     
     @Override
     public Object getOriginalRequest() {
-        return request;
+        return id;
     }
     
     @Override
     public void discard() {
     	super.discard();
-    	request = null;
+    	id = null;
     	setResult(null);
     }
     
@@ -95,7 +95,7 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase<AsyncMultiProce
 
 				try {
 
-					BlockingAsyncMultiProcedure<T> proc = new BlockingAsyncMultiProcedure<>(graph, new AsyncMultiProcedure<T>() {
+					BlockingAsyncMultiProcedure<T> proc = new BlockingAsyncMultiProcedure<>(graph.asyncBarrier, graph, new AsyncMultiProcedure<T>() {
 
 						@Override
 						public void execute(AsyncReadGraph graph, T result) {
@@ -111,9 +111,9 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase<AsyncMultiProce
 							except(t);
 						}
 
-					}, request);
+					}, id);
 
-					request.perform(graph , proc);
+					id.perform(graph , proc);
 
 					proc.get();
 
@@ -137,8 +137,8 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase<AsyncMultiProce
 			
 			@Override
 			public String toString() {
-				if(request == null) return "DISCARDED";
-				else return request.toString() + statusOrException;
+				if(id == null) return "DISCARDED";
+				else return id.toString() + statusOrException;
 			}
         	
         };
@@ -182,12 +182,17 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase<AsyncMultiProce
 	
 	@Override
 	public String toString() {
-		if(request == null) return "DISCARDED";
-		else return request.toString() + statusOrException;
+		if(id == null) return "DISCARDED";
+		else return id.toString() + statusOrException;
 	}
 
 	public Object compute(ReadGraphImpl graph, AsyncMultiProcedure<T> procedure) throws DatabaseException {
-		return graph.processor.cache.performQuery(graph, request, this, procedure);
+		return graph.processor.cache.performQuery(graph, id, this, procedure);
 	}
 
+    @Override
+    public String classId() {
+        return null;
+    }
+
 }