Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '3.9' of https://github.com/JumpMind/symmetric-ds.git in…
…to 3.9
  • Loading branch information
erilong committed Feb 22, 2018
2 parents 3f20535 + 79669d6 commit fd1b760
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
Expand Up @@ -1025,13 +1025,16 @@ protected OutgoingBatch extractOutgoingBatch(ProcessInfo extractInfo, 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());
}
}

Expand Down
Expand Up @@ -233,7 +233,6 @@ https.verified.server.names=
# in the batch tables will be more accurate if this is set to true because each timed
# operation is independent of the others.
#
# DatabaseOverridable: true
# Tags: transport
# Type: boolean
stream.to.file.enabled=true
Expand Down

0 comments on commit fd1b760

Please sign in to comment.