summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-09-02 18:56:29 +0200
committerSimon Rettberg2016-09-02 18:56:29 +0200
commit783de5d9ecbcfe733de3cf7bc694db03ec6d3d69 (patch)
tree72f79c7f9259b3ba8305db99362444ad6546d0d2
parentadded new comparator for sorting OS by name (diff)
downloadmaster-sync-shared-783de5d9ecbcfe733de3cf7bc694db03ec6d3d69.tar.gz
master-sync-shared-783de5d9ecbcfe733de3cf7bc694db03ec6d3d69.tar.xz
master-sync-shared-783de5d9ecbcfe733de3cf7bc694db03ec6d3d69.zip
Fix hash-write-check race condition again ....
-rw-r--r--src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
index 32fdf6c..4135ca7 100644
--- a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
+++ b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java
@@ -464,7 +464,9 @@ public abstract class IncomingTransferBase extends AbstractTransfer implements H
+ " could not be executed. Assuming valid :-(" );
// Fall through
case VALID:
- if ( !chunk.isWrittenToDisk() ) {
+ if ( chunk.isWrittenToDisk() ) {
+ chunks.markCompleted( chunk, true );
+ } else {
try {
writeFileData( chunk.range.startOffset, chunk.range.getLength(), data );
chunks.markCompleted( chunk, true );