diff options
| author | Simon Rettberg | 2015-08-19 20:04:49 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-08-19 20:04:49 +0200 |
| commit | 4d4fe3b86f5c92ea791507fe45d500f796d0dfc8 (patch) | |
| tree | 2e9ab2c97fd9e66f6bd2d9ab136036693345ef26 /dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java | |
| parent | [server] Make a copy of the chunk before passing it to the async hash checker (diff) | |
| download | tutor-module-4d4fe3b86f5c92ea791507fe45d500f796d0dfc8.tar.gz tutor-module-4d4fe3b86f5c92ea791507fe45d500f796d0dfc8.tar.xz tutor-module-4d4fe3b86f5c92ea791507fe45d500f796d0dfc8.zip | |
[client] Send block hashes to server (TODO: master sha1sum)
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java index 72f4f6e0..fabf1d66 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java @@ -54,8 +54,13 @@ public abstract class TransferTask implements Runnable { TransferEvent event = getTransferEvent(); if (event != null) { fireEvent(event); - if (event.state == TransferState.ERROR || event.state == TransferState.FINISHED) + if (event.state == TransferState.ERROR) { break; + } + if (event.state == TransferState.FINISHED) { + isComplete = true; + break; + } } ensureActivity(); Util.sleep(UPDATE_INTERVAL_MS); @@ -205,8 +210,9 @@ public abstract class TransferTask implements Runnable { endgame = true; } if (success && transfers.isEmpty()) { - LOGGER.debug("Transfer finished"); - isComplete = true; + LOGGER.debug("Transfer might have finished"); + lastConnectionAttempt = System.currentTimeMillis() + 3000; // Throttle reconnects + return; // Skip ensureActivity check } } ensureActivity(); |