summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/thrift
diff options
context:
space:
mode:
authorNils Schwabe2014-07-04 13:34:39 +0200
committerNils Schwabe2014-07-04 13:34:39 +0200
commit41c7e8982c98ef9b60f0be99795d14c94549cdb1 (patch)
tree5f8507cfe565524ff35b454983c1ada151652f7a /src/main/java/org/openslx/imagemaster/thrift
parentMoved functionallity from DbKey to DbSatellite (diff)
downloadmasterserver-41c7e8982c98ef9b60f0be99795d14c94549cdb1.tar.gz
masterserver-41c7e8982c98ef9b60f0be99795d14c94549cdb1.tar.xz
masterserver-41c7e8982c98ef9b60f0be99795d14c94549cdb1.zip
Fix some small things
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/thrift')
-rw-r--r--src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java8
1 files changed, 3 insertions, 5 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 458788d..3e9e2eb 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java
@@ -1,6 +1,7 @@
package org.openslx.imagemaster.thrift.server;
import java.nio.ByteBuffer;
+import java.util.List;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
@@ -8,7 +9,6 @@ import org.openslx.imagemaster.server.ApiServer;
import org.openslx.imagemaster.thrift.iface.AuthenticationException;
import org.openslx.imagemaster.thrift.iface.AuthorizationException;
import org.openslx.imagemaster.thrift.iface.DownloadInfos;
-import org.openslx.imagemaster.thrift.iface.FtpCredentials;
import org.openslx.imagemaster.thrift.iface.ImageData;
import org.openslx.imagemaster.thrift.iface.ImageDataException;
import org.openslx.imagemaster.thrift.iface.ImageServer;
@@ -69,10 +69,8 @@ public class ImageServerHandler implements ImageServer.Iface
}
@Override
- public DownloadInfos getImage( String uuid, String serverSessionId ) throws AuthorizationException, ImageDataException, TException
+ public DownloadInfos getImage( String uuid, String serverSessionId, List<Integer> requestedBlocks ) throws AuthorizationException, ImageDataException, TException
{
- // TODO Auto-generated method stub
- return null;
+ return ApiServer.getImage( uuid, serverSessionId, requestedBlocks );
}
-
}