X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fgraph%2FReadGraphImpl.java;h=110e1d59bbb460090a368cc1763b383f2258aa43;hp=48662d1903a08267a13dded57e04e04f8b85db6d;hb=1f4133242efdb193390d76b0952ade00a3a88309;hpb=8f99af83cee60676d80cf2334177ab94f82b7959

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
index 48662d190..110e1d59b 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
@@ -188,8 +188,6 @@ import org.simantics.utils.DataContainer;
 import org.simantics.utils.Development;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.collections.CollectionUtils;
-import org.simantics.utils.threads.logger.ITask;
-import org.simantics.utils.threads.logger.ThreadLogger;
 import org.slf4j.LoggerFactory;
 
 import gnu.trove.map.hash.TObjectIntHashMap;
@@ -1922,14 +1920,11 @@ public class ReadGraphImpl implements AsyncReadGraph {
 	 * Implementation of the interface RequestProcessor
 	 */
 
-	@Override
-	public <T> T syncRequest(final Read<T> request) throws DatabaseException {
-		assert (request != null);
-
-		T result = (T)QueryCache.runnerReadEntry(this, request, parent, null, null, true);
-		return result;
-		
-	}
+    @Override
+    public <T> T syncRequest(final Read<T> request) throws DatabaseException {
+        assert (request != null);
+        return (T)QueryCache.runnerReadEntry(this, request, parent, null, null, true);
+    }
 
 	@Override
 	public <T> T syncRequest(Read<T> request, SyncListener<T> procedure)
@@ -1943,16 +1938,12 @@ public class ReadGraphImpl implements AsyncReadGraph {
 		return syncRequest(request, new NoneToAsyncListener<T>(procedure));
 	}
 
-	@Override
-	public <T> T syncRequest(final Read<T> request, final AsyncProcedure<T> procedure) throws DatabaseException {
-
-		assert (request != null);
-
-		ListenerBase listener = procedure != null ? getListenerBase(procedure) : null;
-		T result = (T)QueryCache.runnerReadEntry(this, request, parent, listener, procedure, true);
-		return result;
-
-	}
+    @Override
+    public <T> T syncRequest(final Read<T> request, final AsyncProcedure<T> procedure) throws DatabaseException {
+        assert (request != null);
+        ListenerBase listener = procedure != null ? getListenerBase(procedure) : null;
+        return (T)QueryCache.runnerReadEntry(this, request, parent, listener, procedure, true);
+    }
 
 	@Override
 	public <T> T syncRequest(final Read<T> request,
@@ -2028,17 +2019,13 @@ public class ReadGraphImpl implements AsyncReadGraph {
 		return syncRequest(request, new NoneToAsyncListener<T>(procedure));
 	}
 
-	@Override
-	final public <T> T syncRequest(final AsyncRead<T> request,
-			final AsyncProcedure<T> procedure) throws DatabaseException {
-
-		assert (request != null);
-
-		ListenerBase listener = getListenerBase(procedure);
-		T result = (T)QueryCache.runnerAsyncReadEntry(this, request, parent, listener, procedure, true); 
-		return result;
-
-	}
+    @Override
+    final public <T> T syncRequest(final AsyncRead<T> request,
+            final AsyncProcedure<T> procedure) throws DatabaseException {
+        assert (request != null);
+        ListenerBase listener = getListenerBase(procedure);
+        return (T)QueryCache.runnerAsyncReadEntry(this, request, parent, listener, procedure, true); 
+    }
 
 	@Override
 	public <T> T syncRequest(AsyncRead<T> request,
@@ -5235,54 +5222,55 @@ public class ReadGraphImpl implements AsyncReadGraph {
 		asyncRequest(request, new NoneToAsyncListener<T>(procedure));
 	}
 
-	@Override
-	final public <T> void asyncRequest(final AsyncRead<T> request,
-			final AsyncProcedure<T> procedure) {
+    @Override
+    final public <T> void asyncRequest(final AsyncRead<T> request,
+            final AsyncProcedure<T> procedure) {
 
-		assert (request != null);
-		assert (procedure != null);
+        assert (request != null);
+        assert (procedure != null);
 
         AsyncBarrierImpl barrier = asyncBarrier;
         if(barrier != null)
             barrier.inc();
 
-		processor.scheduleNow(new SessionTask(this) {
+        processor.scheduleNow(new SessionTask(this) {
 
-			@Override
-			public void run0(int thread) {
+            @Override
+            public void run0(int thread) {
 
-			    if(barrier != null)
-		            barrier.inc();
+                if(barrier != null)
+                    barrier.inc();
 
-			    try {
-					final ListenerBase listener = getListenerBase(procedure);
-					QueryCache.runnerAsyncReadEntry(ReadGraphImpl.this, request, parent, listener, new AsyncProcedure<T>() {
+                try {
+                    final ListenerBase listener = getListenerBase(procedure);
+                    QueryCache.runnerAsyncReadEntry(ReadGraphImpl.this, request, parent, listener, new AsyncProcedure<T>() {
 
-						@Override
-						public void execute(AsyncReadGraph graph, T result) {
-							procedure.execute(graph, result);
-					        if(barrier != null)
-					            barrier.dec();
-						}
+                        @Override
+                        public void execute(AsyncReadGraph graph, T result) {
+                            procedure.execute(graph, result);
+                            if(barrier != null)
+                                barrier.dec();
+                        }
 
-						@Override
-						public void exception(AsyncReadGraph graph, Throwable throwable) {
-							procedure.exception(graph, throwable);
+                        @Override
+                        public void exception(AsyncReadGraph graph, Throwable throwable) {
+                            procedure.exception(graph, throwable);
                             if(barrier != null)
                                 barrier.dec();
-						}
-						
-					}, false);
-			        if(barrier != null)
-			            barrier.dec();
-				} catch (DatabaseException e) {
-					Logger.defaultLogError(e);
-				}
-			}
-			
-		});
+                        }
+
+                    }, false);
+                } catch (DatabaseException e) {
+                    LOGGER.error("Error while executing async request", e);
+                } finally {
+                    if(barrier != null)
+                        barrier.dec();
+                }
+            }
 
-	}
+        });
+
+    }
 
 	@Override
 	public <T> void asyncRequest(AsyncRead<T> request,