diff options
| author | Simon Rettberg | 2014-07-25 14:29:15 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-25 14:29:15 +0200 |
| commit | 28a5b2ecae7285cc2d52a5b7f2c4fb1e94adbb5d (patch) | |
| tree | 9f806267f59ef1ba06d2d3b143aac3ef1fc79e3c | |
| parent | Make trasmit times configurabl (diff) | |
| download | masterserver-28a5b2ecae7285cc2d52a5b7f2c4fb1e94adbb5d.tar.gz masterserver-28a5b2ecae7285cc2d52a5b7f2c4fb1e94adbb5d.tar.xz masterserver-28a5b2ecae7285cc2d52a5b7f2c4fb1e94adbb5d.zip | |
Adapt to refactoring in master-sync-shared
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java index b35088b..6723dc0 100644 --- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java +++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java @@ -140,7 +140,7 @@ public class ConnectionHandler implements IncomingEvent long actual; for ( Integer block : blocks ) { actual = block * Globals.blockSize; - uploader.sendRange( (int)actual, ( ( fileSize - actual ) < Globals.blockSize ) ? (int)fileSize - 1 : ( block + 1 ) * Globals.blockSize - 1 ); // TODO: change this int into long + uploader.prepareSendRange( (int)actual, ( ( fileSize - actual ) < Globals.blockSize ) ? (int)fileSize - 1 : ( block + 1 ) * Globals.blockSize - 1 ); // TODO: change this int into long uploader.sendFile( fileName ); } uploader.close(); @@ -186,7 +186,7 @@ public class ConnectionHandler implements IncomingEvent log.debug( "Block " + blockNumber + " was transmitted " + image.getTimesTransmitted( blockNumber ) + " time(s)." ); downloader.setOutputFilename( connections.get( token ).filepath ); - downloader.readBinary(); + downloader.receiveBinary(); } downloader.close(); } |