diff options
| author | Simon Rettberg | 2015-07-21 14:04:18 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-07-21 14:04:18 +0200 |
| commit | a2555cd06a1fa34067ee34b58e14f275deabd952 (patch) | |
| tree | d79ca6bad232ae158f1491708bb9e9e60c4d024f /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java | |
| parent | [client] Created TransferTask base class for uploads and downloads (diff) | |
| download | tutor-module-a2555cd06a1fa34067ee34b58e14f275deabd952.tar.gz tutor-module-a2555cd06a1fa34067ee34b58e14f275deabd952.tar.xz tutor-module-a2555cd06a1fa34067ee34b58e14f275deabd952.zip | |
[server] Make uploads cancellable, configurable transfer timeouts
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java index 49cfed56..da15656d 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java @@ -201,10 +201,12 @@ public class ActiveUpload { } public synchronized void cancel() { - if (download != null) // TODO: Thread safety - download.close("Cancelled"); - if (state != TransferState.FINISHED) + if (download != null) { + download.cancel(); + } + if (state != TransferState.FINISHED) { state = TransferState.ERROR; + } } /** |