First changes

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.java
index 18d91dc0618643e092aa4d242f6a50545cbf6c6e..31fe0103b646a23ed634c59a6616176406ba1d3d 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.java
@@ -22,8 +22,6 @@ import org.simantics.db.request.RequestFlags;
 final public class ExternalReadEntry<T> extends CacheEntryBase {
 
     final LinkedList<T> items = new LinkedList<T>();
-    
-//    public ArrayList<Procedure<T>> procs;
 
     protected ExternalRead<T> request;
 
@@ -125,7 +123,7 @@ final public class ExternalReadEntry<T> extends CacheEntryBase {
 
                        @Override
                        public void removeEntry(QueryProcessor processor) {
-                               processor.externalReadMap.remove(request);
+                               processor.cache.externalReadMap.remove(request);
                        }
 
                        @Override
@@ -143,7 +141,7 @@ final public class ExternalReadEntry<T> extends CacheEntryBase {
         
     }
 
-       public void performFromCache(Object procedure) {
+       public Object performFromCache(Object procedure) {
                
         Procedure<T> proc = (Procedure<T>)procedure;
 
@@ -156,6 +154,8 @@ final public class ExternalReadEntry<T> extends CacheEntryBase {
             proc.execute((T)getResult());
 
         }
+           
+           return getResult();
                
        }
 
@@ -166,8 +166,8 @@ final public class ExternalReadEntry<T> extends CacheEntryBase {
        }
 
     @Override
-    public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
-        performFromCache(procedure);
+    public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
+        return performFromCache(procedure);
     }
     
     @Override