From a2555cd06a1fa34067ee34b58e14f275deabd952 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 21 Jul 2015 14:04:18 +0200
Subject: [server] Make uploads cancellable, configurable transfer timeouts

---
 .../src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/ActiveUpload.java')

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;
+		}
 	}
 
 	/**
-- 
cgit v1.2.3-55-g7522