diff options
| author | Simon Rettberg | 2016-04-20 17:10:14 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-04-20 17:10:14 +0200 |
| commit | ecd3d22510aa2f1aa0c44cee015bd690d19f45ce (patch) | |
| tree | 8ec91bf9500a9575308898f0f70b5a90f0ba4737 /src/main/java/org/openslx/filetransfer/util/ChunkList.java | |
| parent | Add queryUploadStatus to master server (diff) | |
| download | master-sync-shared-ecd3d22510aa2f1aa0c44cee015bd690d19f45ce.tar.gz master-sync-shared-ecd3d22510aa2f1aa0c44cee015bd690d19f45ce.tar.xz master-sync-shared-ecd3d22510aa2f1aa0c44cee015bd690d19f45ce.zip | |
More imgsync stuff
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/util/ChunkList.java')
| -rw-r--r-- | src/main/java/org/openslx/filetransfer/util/ChunkList.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/filetransfer/util/ChunkList.java b/src/main/java/org/openslx/filetransfer/util/ChunkList.java index 372b082..c497be0 100644 --- a/src/main/java/org/openslx/filetransfer/util/ChunkList.java +++ b/src/main/java/org/openslx/filetransfer/util/ChunkList.java @@ -174,14 +174,14 @@ public class ChunkList * * @param c The chunk in question */ - public synchronized void markSuccessful( FileChunk c ) + public synchronized void markCompleted( FileChunk c, boolean hashCheckSuccessful ) { if ( !pendingChunks.remove( c ) ) { LOGGER.warn( "Inconsistent state: markSuccessful called for Chunk " + c.toString() + ", but chunk is not marked as currently transferring!" ); return; } - c.setStatus( ChunkStatus.COMPLETE ); + c.setStatus( ( hashCheckSuccessful || c.getSha1Sum() == null ) ? ChunkStatus.COMPLETE : ChunkStatus.HASHING ); completeChunks.add( c ); this.notifyAll(); } |