X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FAsyncReadEntry.java;h=75169d02e9946ca0a1dea3f1e03a3dba2ce49b97;hb=refs%2Fchanges%2F11%2F1911%2F1;hp=8e6cbd145a78d9a1aacf3b99f20c396a789beaae;hpb=378f6f82ce88c8ba2ba9f7345cb25679b508bae5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
index 8e6cbd145..75169d02e 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
@@ -12,6 +12,7 @@
 package org.simantics.db.impl.query;
 
 import org.simantics.db.AsyncReadGraph;
+import org.simantics.db.common.GraphSemaphore;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.impl.DebugPolicy;
 import org.simantics.db.impl.graph.ReadGraphImpl;
@@ -45,6 +46,8 @@ final public class AsyncReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> {
     
     final public void addOrSet(AsyncReadGraph graph, Object item) {
 
+//    	System.err.println("addOrSet " + request + " " + Thread.currentThread() + " " + item);
+    	
     	assert(isPending());
 
         synchronized(this) {
@@ -76,20 +79,26 @@ final public class AsyncReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> {
 
 				try {
 
+					GraphSemaphore s = new GraphSemaphore(graph, 0);
+					
 				    request.perform(graph , new AsyncProcedure<T>() {
 
                         @Override
                         public void execute(AsyncReadGraph graph, T result) {
                             addOrSet(graph, result);
+                            s.release();
                         }
             			
             			@Override
             			public void exception(AsyncReadGraph graph, Throwable t) {
             			    except(t);
+                            s.release();
                         }
 
                     });
 
+                    s.waitFor(1);
+
 				} catch (Throwable t) {
 				    except(t);
                 }
@@ -142,7 +151,7 @@ final public class AsyncReadEntry<T> extends CacheEntryBase<AsyncProcedure<T>> {
 	    
 	}
 
-    @Override
+    //@Override
     public Object compute(ReadGraphImpl graph, AsyncProcedure<T> procedure) throws DatabaseException {
 
     	ReadGraphImpl queryGraph = graph.withParent(this);