diff options
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 4 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java index 751e480e..d1c4ede9 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java @@ -126,6 +126,10 @@ public class ServerHandler implements SatelliteServer.Iface { @Override public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException { IncomingDataTransfer upload = fileServer.getUploadByToken(uploadToken); + if (upload == null) { + // It might be a master -> sat transfer... + upload = SyncTransferHandler.getDownloadByToken(uploadToken); + } if (upload == null) throw new TInvalidTokenException(); return upload.getStatus(); diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java index 146f6f5e..37a64ee8 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java @@ -35,7 +35,7 @@ public class WebServer extends NanoHTTPD { public WebServer(int port) { super("127.0.0.1", port); - maxRequestSize = 65535; + super.maxRequestSize = 65535; } @Override |