X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FQueryCollectorImpl2.java;h=84273b81d63cf6921be763840b2c0cae172ba934;hp=0c33321731053d96c7f8c5bcf6c47deac66ba809;hb=0d9b90834ce56b292c00b1a39850ed842c3e4d42;hpb=e5db6157fd8722c946613d4e46d7aaf6bfa92609

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 0c3332173..84273b81d 100644
--- 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;
 
 	}