X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FMultiReadEntry.java;fp=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FMultiReadEntry.java;h=77e3b8d0fc0bd592b9b85c9ea49d34b3b64bcb79;hp=6b7415c9780f7a45c715068c83c4f02f1fe1fb29;hb=77ba75dcaf7d7c16187907f0661916d48e99edf6;hpb=ab7918e4c6dc68b4561fdfe4aa5fd93bf036ad58

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java
index 6b7415c97..77e3b8d0f 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java
@@ -29,26 +29,26 @@ public final class MultiReadEntry<T> extends CacheEntryBase<SyncMultiProcedure<T
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MultiReadEntry.class);
 
-    protected MultiRead<T> request;
+    protected MultiRead<T> id;
     
     MultiReadEntry(MultiRead<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);
     }
     
@@ -86,7 +86,7 @@ public final class MultiReadEntry<T> extends CacheEntryBase<SyncMultiProcedure<T
 				
 				try {
 
-				    request.perform(graph , new SyncMultiProcedure<T>() {
+				    id.perform(graph , new SyncMultiProcedure<T>() {
 
                         @Override
                         public void execute(ReadGraph graph, T result) {
@@ -123,8 +123,8 @@ public final class MultiReadEntry<T> extends CacheEntryBase<SyncMultiProcedure<T
 			
 			@Override
 			public String toString() {
-				if(request == null) return "DISCARDED";
-				else return request.toString() + statusOrException;
+				if(id == null) return "DISCARDED";
+				else return id.toString() + statusOrException;
 			}
         	
         };
@@ -202,12 +202,12 @@ public final class MultiReadEntry<T> extends CacheEntryBase<SyncMultiProcedure<T
 
 	@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, SyncMultiProcedure<T> procedure) throws DatabaseException {
-		return graph.processor.cache.performQuery(graph, request, this, procedure);
+		return graph.processor.cache.performQuery(graph, id, this, procedure);
 	}
 
 }