X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FCodeGen.java;fp=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FCodeGen.java;h=cd540eaadbf59a63c3e450999254ead404a9cefe;hb=1f8b50d81a1aa1bbd67a77f7cbc1060f2eb805d4;hp=008faeea51589b1671a51a18d3f06ef4e72f5701;hpb=86bb6157fdcb4a11caee57487cf8fa894eaae2dd;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CodeGen.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CodeGen.java
index 008faeea5..cd540eaad 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CodeGen.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CodeGen.java
@@ -54,10 +54,10 @@ public class CodeGen {
 			line(content, "        return;");
 			line(content, "    }");
 		}
-		line(content, "    " + clazz + " entry = (" + clazz + ")cache.getOrCreate" + clazz + "(" + signature[1] + (genAsync ? ", isSync" : "") + ");");
+		line(content, "    " + clazz + " entry = (" + clazz + ")cache.getOrCreate" + clazz + "(graph, " + signature[1] + (genAsync ? ", isSync" : "") + ");");
 		if(genAsync) {
 			line(content, "    if(entry == null) {");
-			line(content, "        graph.processor.schedule(Integer.MIN_VALUE, new SessionTask(r, graph.processor.THREAD_MASK+1, -1) {");
+			line(content, "        graph.processor.schedule(new SessionTask(false) {");
 			line(content, "            @Override");
 			line(content, "            public void run(int thread) {");
 			line(content, "                try {");
@@ -102,7 +102,7 @@ public class CodeGen {
 		
 		String lower = Character.toLowerCase(clazz.charAt(0)) + clazz.substring(1);
 		
-		line(content, "" + clazz + " getOrCreate" + clazz + "(" + signature[0] + (genAsync ? ", boolean isSync" : "") + ") throws DatabaseException {");
+		line(content, "" + clazz + " getOrCreate" + clazz + "(ReadGraphImpl graph, " + signature[0] + (genAsync ? ", boolean isSync" : "") + ") throws DatabaseException {");
 		line(content, "    " + clazz + " existing = null;");
 		line(content, "    synchronized(" + lower + "Map) {");
 		line(content, "        existing = (" + clazz + ")" + lower + "Map.get(" + signature[1] + ");");
@@ -121,11 +121,11 @@ public class CodeGen {
 		line(content, "    }");
 		if(genAsync) {
 			line(content, "    if(existing.isPending()) {");
-			line(content, "      if(isSync) waitPending(existing);");
+			line(content, "      if(isSync) waitPending(graph, existing);");
 			line(content, "      else return null;");
 			line(content, "    }");
 		} else {
-			line(content, "    if(existing.isPending()) waitPending(existing);");
+			line(content, "    if(existing.isPending()) waitPending(graph, existing);");
 		}
 		line(content, "    return existing;");
 		line(content, "}");