Merge branch 'master' into private/db-threads

[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 8a8b18b7dda5641113207102d8c43f54c5608716..a2a7aded168da11f23e65011de56fe42194cf8b6 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
@@ -100,7 +100,8 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase {
         
     }
 
-    final synchronized public void addOrSet(Object item) {
+    @SuppressWarnings("unchecked")
+       final synchronized public void addOrSet(Object item) {
 
        assert(isPending());
        
@@ -155,7 +156,7 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase {
 
                        @Override
                        public void removeEntry(QueryProcessor processor) {
-                       processor.asyncMultiReadMap.remove(request);
+                       processor.cache.asyncMultiReadMap.remove(request);
                        }
 
                        @Override
@@ -173,8 +174,9 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase {
         
     }
 
+       @SuppressWarnings("unchecked")
        @Override
-       public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
+       public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
                
                final AsyncMultiProcedure<T> proc = (AsyncMultiProcedure<T>)procedure;
 
@@ -206,7 +208,7 @@ final public class AsyncMultiReadEntry<T> extends CacheEntryBase {
 
         }
                
-               
+               return getResult();
                
        }