diff options
| author | Nils Schwabe | 2014-04-22 16:56:07 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-04-22 16:56:07 +0200 |
| commit | 01e662bdfff823c4f5f0b6a270807fd0a3d2825f (patch) | |
| tree | daf063bc84c06781768794c17cc76f08decaa9c3 /src/main/java/org/openslx/imagemaster/thrift | |
| parent | Added test case for sha512crypt, removed try/catch blocks from other tests, s... (diff) | |
| download | masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.tar.gz masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.tar.xz masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.zip | |
added a method to imageserver so that finshed uploads can be signaled
did some todos from simon
moved FtpCredentials creation to MasterFtpServer.java
moved some options to to config file
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/thrift')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java index 096f63f..899af1a 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java +++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java @@ -53,10 +53,16 @@ public class ImageServerHandler implements ImageServer.Iface } @Override - public FtpCredentials submitImage(ImageData imageDescription, - ServerSessionData serverSessionData) throws AuthorizationException, + public FtpCredentials submitImage(String serverSessionId, + ImageData imageDescription) throws AuthorizationException, TException { - return ApiServer.submitImage(imageDescription, serverSessionData); + return ApiServer.submitImage(serverSessionId, imageDescription); + } + + @Override + public boolean finshedUpload(String serverSessionId, + ImageData imageDescription) throws AuthorizationException { + return ApiServer.finishedUpload(serverSessionId, imageDescription); } } |