X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FAsyncReadEntry.java;h=2410dfad7cf3b7c1e1c4bd26eca52e53a45ffd6a;hb=e3290cc52342e783a2617f3009fff8e6f3e54560;hp=c6091eb268c2268ef9413c4ddf70caefb0a807b8;hpb=67b615f53cb96c89900131f642648b5219ae8efc;p=simantics%2Fplatform.git

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 c6091eb26..2410dfad7 100644
--- 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;