Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl.java
index 965f1e39f41fb1dc4d99000d533c03dde6c21da3..e6dc252c41f210d00586895aeabe6d7c619001f3 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl.java
@@ -42,6 +42,10 @@ class QueryCollectorImpl implements QueryProcessor.QueryCollector {
        @Override
        public void collect(int youngTarget, int allowedTimeInMs) {
 
+               // Flush listener registrations to prevent the collector from trashing
+               // listeners that are still queued up waiting to be registered.
+               queryProcessor.listening.sync();
+
                long start = System.nanoTime();
 
                // Refresh current size
@@ -144,6 +148,7 @@ class QueryCollectorImpl implements QueryProcessor.QueryCollector {
                                                        
                                                } else {
                                                        
+                                                       entry.pruneParentSet();
                                                        support.setLevel(entry, parent.getLevel() + 1);
                                                        
                                                }
@@ -160,7 +165,7 @@ class QueryCollectorImpl implements QueryProcessor.QueryCollector {
                                                        }
                                                }
 
-                                               if(queryProcessor.hasListenerAfterDisposing(entry)) {
+                                               if(queryProcessor.listening.hasListenerAfterDisposing(entry)) {
                                                        if((status & CacheEntry.HAS_BEEN_BOUND) == 0) {
                                                                queryProcessor.boundQueries++;
                                                                entry.setGCStatusFlag(CacheEntry.HAS_BEEN_BOUND, true);
@@ -176,7 +181,7 @@ class QueryCollectorImpl implements QueryProcessor.QueryCollector {
        }
 
        private boolean tryCollect(CacheEntry entry) {
-               if (!queryProcessor.hasListenerAfterDisposing(entry))
+               if (!queryProcessor.listening.hasListenerAfterDisposing(entry))
                        if(entry.shouldBeCollected()) {
                                queryProcessor.removeQuery(entry);
                                support.remove();