Multiple reader thread support for db client

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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl2.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl2.java
index 0c33321731053d96c7f8c5bcf6c47deac66ba809..84273b81d63cf6921be763840b2c0cae172ba934 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl2.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCollectorImpl2.java
@@ -25,7 +25,7 @@ class QueryCollectorImpl2 implements QueryProcessor.QueryCollector {
                this.support = support;
        }
 
-       private boolean findCollectables(CacheEntry entry, Map<CacheEntry, Boolean> collectables, ArrayList<CacheEntry> result) {
+       private boolean findCollectables(CacheEntry<?> entry, Map<CacheEntry, Boolean> collectables, ArrayList<CacheEntry> result) {
 
                if (entry.isDiscarded()) {
                        if(DebugPolicy.COLLECT && DebugPolicy.VERBOSE)
@@ -129,7 +129,7 @@ class QueryCollectorImpl2 implements QueryProcessor.QueryCollector {
 
                // Prune discarded parents
                ArrayList<CacheEntry> removals = new ArrayList<CacheEntry>();
-               for (CacheEntry entry : support.allCaches().toCollection()) {
+               for (CacheEntry<?> entry : support.allCaches().toCollection()) {
                        for(CacheEntry p : entry.getParents(queryProcessor)) {
                                if(p.isDiscarded()) removals.add(p);
                        }
@@ -157,7 +157,7 @@ class QueryCollectorImpl2 implements QueryProcessor.QueryCollector {
                        if(DebugPolicy.COLLECT)
                                new DebugException("checking the need for collecting queries (current=" + current + " , lastKnownFixedSize=" + lastKnownFixedSize + " max free=" + 0 + ")").printStackTrace();
 
-                       QueryProcessor.collecting = true;
+                       queryProcessor.cache.collecting = true;
 
                        long start = System.nanoTime();
 
@@ -175,8 +175,7 @@ class QueryCollectorImpl2 implements QueryProcessor.QueryCollector {
                        t.printStackTrace();
                }
 
-               QueryProcessor.collecting = false;
-
+               queryProcessor.cache.collecting = false;
 
        }