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=155bc209bf27d2edc1a4d771f14d74047d1eeebd;hb=ded784594eb0e1fb318fbb931135288152691cf2;hp=96afa8c4f586bd8fb83135e4eca2c4803542c3f8;hpb=f62e0d1376fc97b0a5b1ade086d52e77a606f7e2;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..155bc209b 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 @@ -38,10 +38,6 @@ final public class Types extends UnaryQuery> { public static void computeForEach(final ReadGraphImpl graph, int id, Types entry, final InternalProcedure 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> { @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> { } }); + + return; } @@ -103,9 +104,7 @@ final public class Types extends UnaryQuery> { @Override public void execute(ReadGraphImpl graph, int i) throws DatabaseException { - synchronized(result) { - result.add(i); - } + result.add(i); inc();