diff options
author | Nils Schwabe | 2014-08-28 15:16:01 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-08-28 15:16:01 +0200 |
commit | d9b0b68c0926e60fcdedf1047a76051676b37d65 (patch) | |
tree | 27214e5bf037ca5e21f4466af76b0fa73db3b46c /src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java | |
parent | Fix bug where the challengeResponse was to long (diff) | |
download | masterserver-d9b0b68c0926e60fcdedf1047a76051676b37d65.tar.gz masterserver-d9b0b68c0926e60fcdedf1047a76051676b37d65.tar.xz masterserver-d9b0b68c0926e60fcdedf1047a76051676b37d65.zip |
Make javadoc and some cosmetic changes
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java | 5 |
1 files changed, 3 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 0447e68..7fa9c4e 100644 --- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java +++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java @@ -27,6 +27,7 @@ import org.openslx.imagemaster.Globals; /** * Class to handle all incoming and outgoing connections. + * Also handles the authentication and the saving/delivering of images. */ public class ConnectionHandler implements IncomingEvent { @@ -140,7 +141,7 @@ public class ConnectionHandler implements IncomingEvent long actual; for ( Integer block : blocks ) { actual = block * Globals.blockSize; - uploader.prepareSendRange( actual, ( ( fileSize - actual ) < Globals.blockSize ) ? fileSize : ( block + 1 ) * Globals.blockSize ); + uploader.sendRange( actual, ( ( fileSize - actual ) < Globals.blockSize ) ? fileSize : ( block + 1 ) * Globals.blockSize ); uploader.sendFile( fileName ); } uploader.close(); @@ -186,7 +187,7 @@ public class ConnectionHandler implements IncomingEvent log.debug( "Block " + blockNumber + " was transmitted " + image.getTimesTransmitted( blockNumber ) + " time(s)." ); downloader.setOutputFilename( connections.get( token ).filepath ); - downloader.receiveBinary(); + downloader.readBinary(); } downloader.close(); } |