First step to enable reading of cache when not writing

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / AsyncMultiReadEntry.java

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 bc3cf0a4f52b7e2c37fbc101ceba389b0ae54f2b..ea88d179107c920f9f10193f727907a56d39356e 100644 (file)
--- 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);
     }
     
@@ -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,12 @@ 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);
        }
 
 }