X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FReadEntry.java;h=edc32454929542ab76a0f4a51155559a52b22324;hb=a1dd54cd8e3595e66c83ad0e2d935470a3567481;hp=e4ff1ea874bb2c3b9f8e288d413eaedc49f51c51;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java
index e4ff1ea87..edc324549 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ReadEntry.java
@@ -97,7 +97,7 @@ final public class ReadEntry<T> extends CacheEntryBase {
 
 			@Override
 			public void removeEntry(QueryProcessor processor) {
-				processor.readMap.remove(request);
+				processor.cache.readMap.remove(request);
 			}
 
 			@Override
@@ -119,28 +119,28 @@ final public class ReadEntry<T> extends CacheEntryBase {
         
     }
     
-	public void performFromCache(ReadGraphImpl graph, Object provider,	Object procedure) {
+	public Object performFromCache(ReadGraphImpl graph, Object provider,	Object procedure) {
 	    
         AsyncProcedure<T> proc = (AsyncProcedure<T>)procedure;
 
-	    if(isExcepted()) {
-
-            try {
-                proc.exception(graph, (Throwable)getResult());
-            } catch (Throwable t) {
-                t.printStackTrace();
-            }
-	        
-	    } else {
-	        
-            try {
-                proc.execute(graph, (T)getResult());
-            } catch (Throwable t) {
-                t.printStackTrace();
-            }
-
-	    }
+        if(proc != null) {
+        	if(isExcepted()) {
+        		try {
+        			proc.exception(graph, (Throwable)getResult());
+        		} catch (Throwable t) {
+        			t.printStackTrace();
+        		}
+        	} else {
+        		try {
+        			proc.execute(graph, (T)getResult());
+        		} catch (Throwable t) {
+        			t.printStackTrace();
+        		}
+        	}
+        }
 		
+	    return (T)getResult();
+	    
 	}
 	
 	@Override