diff options
| author | Simon Rettberg | 2015-07-15 18:33:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-07-15 18:33:09 +0200 |
| commit | f8e26464cf99ff402eda61d006308cd8adbcb0b0 (patch) | |
| tree | b84e452af18f629668b918473003356ae04b4c0b /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | |
| parent | [client] always retry thrift call automatically on first failure (diff) | |
| download | tutor-module-f8e26464cf99ff402eda61d006308cd8adbcb0b0.tar.gz tutor-module-f8e26464cf99ff402eda61d006308cd8adbcb0b0.tar.xz tutor-module-f8e26464cf99ff402eda61d006308cd8adbcb0b0.zip | |
[server] Fix SQL pooling issue, implement upload
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 | 9 |
1 files changed, 6 insertions, 3 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 22a90de7..7f9f9bbc 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 @@ -68,9 +68,12 @@ public class ServerHandler implements SatelliteServer.Iface { @Override public TransferInformation requestImageVersionUpload(String userToken, String imageBaseId, long fileSize, - List<ByteBuffer> blockHashes) throws TTransferRejectedException, TAuthorizationException { - // TODO Auto-generated method stub - return null; + List<ByteBuffer> blockHashes) throws TTransferRejectedException, TAuthorizationException, + TInternalServerError, TNotFoundException { + UserInfo user = SessionManager.getOrFail(userToken); + User.canEditBaseImageOrFail(user, imageBaseId); + String transferId = fileServer.createNewUserUpload(user, fileSize, blockHashes); + return new TransferInformation(transferId, fileServer.getPlainPort(), fileServer.getSslPort()); } @Override |