X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FTransientResourceRead.java;fp=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FTransientResourceRead.java;h=73e612a9f4004b154478ad3893213e6960d5d8d3;hp=117a1a27fb3d0e2fba3acab9ef9a57f7280858c2;hb=1f4133242efdb193390d76b0952ade00a3a88309;hpb=8f99af83cee60676d80cf2334177ab94f82b7959

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java
index 117a1a27f..73e612a9f 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TransientResourceRead.java
@@ -19,37 +19,41 @@ import org.simantics.db.service.QueryControl;
 
 abstract public class TransientResourceRead<R> extends BinaryRead<Object,Resource,R> implements ReadExt {
 
-	protected static final Object WITH_PARENT = new Object();
-	
-	public TransientResourceRead(ReadGraph graph, Resource parameter) throws DatabaseException {
-		this(graph, graph.getService(QueryControl.class), parameter);
-	}
-	
-	public TransientResourceRead(ReadGraph graph, QueryControl qc, Resource parameter) throws DatabaseException {
-		super(resolveFirstParameter(graph, qc), parameter);
-	}
-
-	final private static Object resolveFirstParameter(ReadGraph graph, QueryControl qc) throws DatabaseException {
-		if(qc.hasParentRequest(graph)) return WITH_PARENT;
-		else return graph.getModificationCounter();
-	}
-
-	@Override
-	final public R perform(ReadGraph _graph) throws DatabaseException {
-		if(parameter == WITH_PARENT) {
-			return perform(_graph, parameter2);
-		} else {
-			QueryControl qc = _graph.getService(QueryControl.class);
-			ReadGraph graph = qc.getIndependentGraph(_graph);
-			return perform(graph, parameter2);
-		}
-	}
-
-	abstract public R perform(ReadGraph graph, Resource parameter) throws DatabaseException;
-    
-	@Override
-	public boolean isImmutable(ReadGraph graph) throws DatabaseException {
-		return graph.isImmutable(parameter2);
-	}
-	
+    protected static final Object WITH_PARENT = new Object();
+
+    public TransientResourceRead(ReadGraph graph, Resource parameter) throws DatabaseException {
+        this(graph, graph.getService(QueryControl.class), parameter);
+    }
+
+    public TransientResourceRead(ReadGraph graph, QueryControl qc, Resource parameter) throws DatabaseException {
+        super(resolveFirstParameter(graph, qc), parameter);
+    }
+
+    final private static Object resolveFirstParameter(ReadGraph graph, QueryControl qc) throws DatabaseException {
+        if(qc.hasParentRequest(graph)) return WITH_PARENT;
+        else return graph.getModificationCounter();
+    }
+
+    @Override
+    final public R perform(ReadGraph _graph) throws DatabaseException {
+        if(parameter == WITH_PARENT) {
+            return perform(_graph, parameter2);
+        } else {
+            QueryControl qc = _graph.getService(QueryControl.class);
+            return qc.syncRequestIndependent(_graph, new UniqueRead<R>() {
+                @Override
+                public R perform(ReadGraph graph) throws DatabaseException {
+                    return TransientResourceRead.this.perform(graph, parameter2);
+                }
+            });
+        }
+    }
+
+    abstract public R perform(ReadGraph graph, Resource parameter) throws DatabaseException;
+
+    @Override
+    public boolean isImmutable(ReadGraph graph) throws DatabaseException {
+        return graph.isImmutable(parameter2);
+    }
+
 }