Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.8
JumpMind · Feb 22, 2018 · 890c655 · 890c655
2 parents 65ed381 + 4c63eb2
commit 890c655
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -911,13 +911,16 @@ protected OutgoingBatch extractOutgoingBatch(ProcessInfo processInfo, Node targe
                         resource.delete();
                     }
                     throw ex;
-                } finally {                    
-                    IStagedResource resource = getStagedResource(currentBatch);
-                    if (resource != null) {
-                        resource.setState(State.DONE);
+                } finally {
+                    try {                        
+                        IStagedResource resource = getStagedResource(currentBatch);
+                        if (resource != null) {
+                            resource.setState(State.DONE);
+                        }
+                    } finally {                        
+                        releaseLock(lock, currentBatch, useStagingDataWriter);
+                        log.debug("{} released lock for batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                     }
-                    releaseLock(lock, currentBatch, useStagingDataWriter);
-                    log.debug("{} released lock for batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                 }
             }