summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/thrift/server
diff options
context:
space:
mode:
authorSimon Rettberg2014-07-07 15:12:47 +0200
committerSimon Rettberg2014-07-07 15:12:47 +0200
commit4d116e1a05a8e5ae342209131ef8905ea52136f0 (patch)
treeabb9122e81009d71eb9f3061302762b1efc1ae01 /src/main/java/org/openslx/imagemaster/thrift/server
parentmore TODOs (diff)
parentAdd argument to send crc sums over thrift (diff)
downloadmasterserver-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/thrift/server')
-rw-r--r--src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java4
1 files changed, 2 insertions, 2 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 3e9e2eb..bef8191 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
@@ -63,9 +63,9 @@ public class ImageServerHandler implements ImageServer.Iface
}
@Override
- public UploadInfos submitImage( String serverSessionId, ImageData imageDescription ) throws AuthorizationException, ImageDataException, UploadException, TException
+ public UploadInfos submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums ) throws AuthorizationException, ImageDataException, UploadException, TException
{
- return ApiServer.submitImage( serverSessionId, imageDescription );
+ return ApiServer.submitImage( serverSessionId, imageDescription, crcSums );
}
@Override