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 c6091eb268c2268ef9413c4ddf70caefb0a807b8..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
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import java.util.ArrayList;
-
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.impl.DebugPolicy;
 import org.simantics.db.impl.graph.ReadGraphImpl;
@@ -147,7 +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;