Fixes based on feedback

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / BlockingAsyncProcedure.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java
index ad9f1643829fe506ac57125edaf2bc724a249d05..2d3e2804c6ebf4d630984892195c6fe2e2e4b0fa 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/BlockingAsyncProcedure.java
@@ -14,6 +14,7 @@ package org.simantics.db.impl;
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.impl.graph.AsyncBarrierImpl;
 import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.procedure.AsyncProcedure;
 
@@ -22,50 +23,53 @@ public class BlockingAsyncProcedure<Result> implements AsyncProcedure<Result> {
     private static final Object NO_RESULT = new Object();
 
     private final Object key;
-    private final ReadGraphImpl graph;
+    private final AsyncBarrierImpl barrier;
+    private final ReadGraphImpl procedureGraph;
     private final AsyncProcedure<Result> procedure;
 
     private Object result = NO_RESULT;
     private Throwable exception = null;
 
-    public BlockingAsyncProcedure(ReadGraphImpl graph, AsyncProcedure<Result> procedure, Object key) {
+    public BlockingAsyncProcedure(AsyncBarrierImpl barrier, ReadGraphImpl procedureGraph, AsyncProcedure<Result> procedure, Object key) {
         this.procedure = procedure;
         this.key = key;
-        this.graph = graph;
-        this.graph.asyncBarrier.inc();
+        this.barrier = barrier;
+        this.barrier.inc();
+        this.procedureGraph = procedureGraph;
     }
 
     @Override
-    public void execute(AsyncReadGraph graph, Result result) {
+    public void execute(AsyncReadGraph graph_, Result result) {
         this.result = result;
-        this.graph.asyncBarrier.dec();
         try {
-            if(procedure != null) procedure.execute(graph, result);
+            if(procedure != null) procedure.execute(procedureGraph, result);
         } catch (Throwable throwable) {
             Logger.defaultLogError("AsyncProcedure.execute threw for " + procedure, throwable);
+        } finally {
+            barrier.dec();
         }
     }
 
     @Override
-    public void exception(AsyncReadGraph graph, Throwable t) {
+    public void exception(AsyncReadGraph graph_, Throwable t) {
         this.exception = t;
         try {
-            if(procedure != null) procedure.exception(graph, t);
+            if(procedure != null) procedure.exception(procedureGraph, t);
         } catch (Throwable throwable) {
             Logger.defaultLogError("AsyncProcedure.exception threw for " + procedure, throwable);
         } finally {
-            this.graph.asyncBarrier.dec();
+            barrier.dec();
         }
     }
 
     public void waitBarrier() {
-        graph.asyncBarrier.waitBarrier(key, graph);
+        barrier.waitBarrier(key, procedureGraph);
     }
 
     @SuppressWarnings("unchecked")
     public Result get() throws DatabaseException {
 
-        graph.asyncBarrier.waitBarrier(key, graph);
+        barrier.waitBarrier(key, procedureGraph);
 
         if(exception != null) {
             if(exception instanceof DatabaseException) throw (DatabaseException)exception;
@@ -77,7 +81,7 @@ public class BlockingAsyncProcedure<Result> implements AsyncProcedure<Result> {
     }
 
     public boolean isDone() {
-        return graph.asyncBarrier.get() == 0;
+        return barrier.get() == 0;
     }
 
     @SuppressWarnings("unchecked")