diff options
| author | Simon Rettberg | 2015-09-16 10:34:13 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-16 10:34:13 +0200 |
| commit | 668d51c33c923b3526438644ec9f2ea4e2ebd2a8 (patch) | |
| tree | ea91ca8c45108b48aaea75859dc0f71e778cef43 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | |
| parent | [server] Reduce DB caching time of user and org perms to 15 secs (diff) | |
| download | tutor-module-668d51c33c923b3526438644ec9f2ea4e2ebd2a8.tar.gz tutor-module-668d51c33c923b3526438644ec9f2ea4e2ebd2a8.tar.xz tutor-module-668d51c33c923b3526438644ec9f2ea4e2ebd2a8.zip | |
[server] Support querying master->sat transfer status
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 4 |
1 files changed, 4 insertions, 0 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(); |