X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionImplSocket.java;h=2ff47c29266912afa68ee0515fd5c47d1b809b89;hp=80dc3b9bbbbea42e31c1ee3fdc09f613e4753ec1;hb=cec265e1216a0a211e6e6dc4f91d5fda4c5747db;hpb=d33a5a61e2c056a3d48733819257890406ee9d52

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
index 80dc3b9bb..2ff47c292 100644
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
@@ -665,6 +665,7 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                 } catch (Throwable e) {
                     delayedWriteState.except(e);
                     total.finish();
+                    dwg.close();
                     return;
                 } finally {
 //                    newGraph.state.barrier.dec();
@@ -848,14 +849,17 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
         private void maintainCluster(ClusterImpl before, ClusterI after_) {
             if(after_ != null && after_ != before) {
                 ClusterImpl after = (ClusterImpl)after_;
-                if(currentCluster == before) currentCluster = after;
+                if(currentCluster == before) {
+                    currentCluster = after;
+                }
                 clusterTable.replaceCluster(after);
             }
         }
 
         public int createResourceKey(int foreignCounter) throws DatabaseException {
-            if(currentCluster == null)
+            if(currentCluster == null) {
                 currentCluster = getNewResourceCluster();
+            }
             if(currentCluster.getNumberOfResources(clusterTranslator) == ClusterTable.CLUSTER_FILL_SIZE) {
                 ClusterWriteOnly newCluster = (ClusterWriteOnly)getNewResourceCluster();
                 newCluster.foreignLookup = new byte[foreignCounter];