summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-07-21 14:04:18 +0200
committerSimon Rettberg2015-07-21 14:04:18 +0200
commita2555cd06a1fa34067ee34b58e14f275deabd952 (patch)
treed79ca6bad232ae158f1491708bb9e9e60c4d024f /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
parent[client] Created TransferTask base class for uploads and downloads (diff)
downloadtutor-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/FileServer.java')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
index 3859322f..93089b5a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
@@ -31,7 +31,7 @@ public class FileServer implements IncomingEvent {
/**
* Listener for incoming unencrypted connections
*/
- private final Listener plainListener = new Listener(this, null, 9092); // TODO: Config
+ private final Listener plainListener = new Listener(this, null, 9092, Constants.TRANSFER_TIMEOUT); // TODO: Config
private final ThreadPoolExecutor transferPool = new ThreadPoolExecutor(2, Constants.MAX_UPLOADS + Constants.MAX_DOWNLOADS, 1, TimeUnit.MINUTES, new ArrayBlockingQueue<Runnable>(1));