Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java
index dd410b4ce7e8c57fba7e86d94a30dbb7b9ec1e9f..a26460a47d733538aa0e3ec287541be76eee6c4e 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryListening.java
@@ -293,7 +293,7 @@ public class QueryListening {
         if(base == null) return;
 
         consumer.accept(() -> {
-            ListenerEntry entry = addedEntries.get(base);
+            ListenerEntry entry = addedEntries.remove(base);
             if(entry != null) entry.setLastKnown(result);
         });
 
@@ -413,7 +413,7 @@ public class QueryListening {
 
     }
 
-    public void fireListeners(WriteGraphImpl graph) {
+    public void fireListeners(ReadGraphImpl graph) {
 
         assert (!processor.updating);
         assert (!processor.cache.collecting);