diff options
| author | Simon Rettberg | 2014-07-07 15:12:47 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-07 15:12:47 +0200 |
| commit | 4d116e1a05a8e5ae342209131ef8905ea52136f0 (patch) | |
| tree | abb9122e81009d71eb9f3061302762b1efc1ae01 /src/main/java/org/openslx/imagemaster/server | |
| parent | more TODOs (diff) | |
| parent | Add argument to send crc sums over thrift (diff) | |
| download | masterserver-4d116e1a05a8e5ae342209131ef8905ea52136f0.tar.gz masterserver-4d116e1a05a8e5ae342209131ef8905ea52136f0.tar.xz masterserver-4d116e1a05a8e5ae342209131ef8905ea52136f0.zip | |
Merge branch 'master' of openslx.org:bwlp/masterserver
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/server')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/server/ApiServer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/server/ApiServer.java b/src/main/java/org/openslx/imagemaster/server/ApiServer.java index ac1ab85..237789d 100644 --- a/src/main/java/org/openslx/imagemaster/server/ApiServer.java +++ b/src/main/java/org/openslx/imagemaster/server/ApiServer.java @@ -118,14 +118,14 @@ public class ApiServer // return ftpCredentials; // } - public static UploadInfos submitImage( String serverSessionId, ImageData imageDescription ) throws AuthorizationException, ImageDataException, UploadException + public static UploadInfos submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums ) throws AuthorizationException, ImageDataException, UploadException { // first check session of server if ( ServerSessionManager.getSession( serverSessionId ) == null ) { throw new AuthorizationException( AuthorizationError.NOT_AUTHENTICATED, "No valid serverSessioId" ); } // then let the image processor decide what to do - return ImageProcessor.getUploadInfos(serverSessionId, imageDescription); + return ImageProcessor.getUploadInfos(serverSessionId, imageDescription, crcSums); } public static DownloadInfos getImage( String uuid, String serverSessionId, List<Integer> requestedBlocks ) throws AuthorizationException, ImageDataException |