Merge branch 'db-threads' into private/db-threads

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQueryHash.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQueryHash.java
index f09ccc082c4a425fc5ab2b5cc25169f9bcea7712..3ac46276fe9d88f49f710eaa101ab8ef9210080b 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQueryHash.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQueryHash.java
@@ -74,25 +74,14 @@ abstract public class BinaryQueryHash<Procedure> extends THash {
             throw new Error("Not possible!");
         }
 
-//        @Override
-//        public void reset() {
-//            throw new Error("Not possible!");
-//        }
-
                @Override
-               public void performFromCache(ReadGraphImpl graph, QueryProcessor provider,
+               public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider,
                                Procedure procedure) {
             throw new Error("Not possible!");
                }
 
-//             @Override
-//             public void performFromCache(int callerThread, Object provider,
-//                             Object procedure) {
-//            throw new Error("Not possible!");
-//             }
-
                @Override
-               public void performFromCache(ReadGraphImpl graph, Object provider,
+               public Object performFromCache(ReadGraphImpl graph, Object provider,
                                Object procedure) {
             throw new Error("Not possible!");
                }