Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java
index 26eff457dc99f29e741b53c73be2db895d4883a6..fe24846aa318539da2524f19a0c50b4a2e382d5c 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java
@@ -15,6 +15,8 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.request.RequestFlags;
 
+import gnu.trove.list.array.TByteArrayList;
+
 public abstract class UnaryQuery<Procedure> extends CacheEntryBase<Procedure> implements Query {
 
     final public int id;
@@ -65,7 +67,17 @@ public abstract class UnaryQuery<Procedure> extends CacheEntryBase<Procedure> im
     
     @Override
     boolean isImmutable(ReadGraphImpl graph) throws DatabaseException {
-               return graph.processor.isImmutable(id);
+        return graph.processor.isImmutable(id);
+    }
+    
+    @Override
+    public long cluster(QueryProcessor processor) {
+        return processor.cluster(id);
+    }
+    
+    @Override
+    public void serializeKey(QuerySerializer serializer) {
+        serializer.addResource(id);
     }
     
 }