Merge branch 'master' into private/db-threads

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
index a9726a75d6ac4eb5df323625ffd19da9369bcb9b..2410dfad7cf3b7c1e1c4bd26eca52e53a45ffd6a 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
@@ -126,7 +126,7 @@ final public class AsyncReadEntry<T> extends CacheEntryBase {
 
                        @Override
                        public void removeEntry(QueryProcessor qp) {
-                       qp.asyncReadMap.remove(request);
+                       qp.cache.asyncReadMap.remove(request);
                        }
 
                        @Override
@@ -145,8 +145,12 @@ final public class AsyncReadEntry<T> extends CacheEntryBase {
         
     }
 
+<<<<<<< HEAD
        @SuppressWarnings("unchecked")
        public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
+=======
+       public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
+>>>>>>> refs/heads/db-threads
                
         AsyncProcedure<T> proc = (AsyncProcedure<T>)procedure;
 
@@ -168,6 +172,8 @@ final public class AsyncReadEntry<T> extends CacheEntryBase {
             
         }
                
+           return getResult();
+           
        }
 
        @Override