X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FTypes.java;h=512045e17be63f354fd12a41a9d87cfd17d1afca;hb=68ce0966a57f5153b133c6283fdbae10f683b745;hp=96afa8c4f586bd8fb83135e4eca2c4803542c3f8;hpb=9fcf23f51b59d737a05178832760a8dab950eb8d;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java
index 96afa8c4f..512045e17 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Types.java
@@ -30,7 +30,7 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
  		provider.cache.remove(this);
  	}
 
- 	@Override
+ 	//@Override
  	public Object compute(final ReadGraphImpl graph, final InternalProcedure<IntSet> procedure) throws DatabaseException {
 		computeForEach(graph, id, this, procedure);
 		return getResult();
@@ -38,10 +38,6 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
 
  	public static void computeForEach(final ReadGraphImpl graph, int id, Types entry, final InternalProcedure<IntSet> procedure) throws DatabaseException {
 
- 		if(entry != null)
- 			if(entry.isReady())
- 				System.err.println("asd");
- 		
  		assert(procedure != null);
 
  		QueryProcessor processor = graph.processor;
@@ -56,7 +52,10 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
  				@Override
  				public void execute(ReadGraphImpl graph, IntSet types) throws DatabaseException {
 
- 					if(entry != null) entry.addOrSet(graph, types, processor);
+ 					if(entry != null) {
+ 						entry.addOrSet(graph, types, processor);
+ 						entry.finish();
+ 					}
  					procedure.execute(graph, types);
 
  				}
@@ -67,6 +66,8 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
  				}
 
  			});
+ 			
+ 			return;
 
  		}
  		
@@ -103,9 +104,7 @@ final public class Types extends UnaryQuery<InternalProcedure<IntSet>> {
             @Override
             public void execute(ReadGraphImpl graph, int i) throws DatabaseException {
                 
-            	synchronized(result) {
-            		result.add(i);
-            	}
+            	result.add(i);
                 
                 inc();