summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/filetransfer/Downloader.java
diff options
context:
space:
mode:
authorNils Schwabe2014-09-11 18:00:16 +0200
committerSimon Rettberg2014-09-11 18:03:49 +0200
commitd166b93bc44e4f3b7f05ff025b5f7d1039391e70 (patch)
treeb24ae28d98ac368abca6c2e3c9d2c006da0567e9 /src/main/java/org/openslx/filetransfer/Downloader.java
parentChange int to long again (diff)
downloadmaster-sync-shared-d166b93bc44e4f3b7f05ff025b5f7d1039391e70.tar.gz
master-sync-shared-d166b93bc44e4f3b7f05ff025b5f7d1039391e70.tar.xz
master-sync-shared-d166b93bc44e4f3b7f05ff025b5f7d1039391e70.zip
Revert "Change int to long again"
This reverts commit e6e4e6ea987021b433518f551452e212bf47f333.
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/Downloader.java')
-rw-r--r--src/main/java/org/openslx/filetransfer/Downloader.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Downloader.java b/src/main/java/org/openslx/filetransfer/Downloader.java
index dccee8f..c860f5e 100644
--- a/src/main/java/org/openslx/filetransfer/Downloader.java
+++ b/src/main/java/org/openslx/filetransfer/Downloader.java
@@ -135,7 +135,7 @@ public class Downloader
* @param a
* @param b
*/
- public Boolean sendRange( long a, long b )
+ public Boolean sendRange( int a, int b )
{
try {
RANGE = a + ":" + b;
@@ -188,11 +188,11 @@ public class Downloader
*
* @return
*/
- public long getStartOfRange()
+ public int getStartOfRange()
{
if ( RANGE != null ) {
String[] splitted = RANGE.split( ":" );
- return Long.parseLong( splitted[0] );
+ return Integer.parseInt( splitted[0] );
}
return -1;
}
@@ -220,7 +220,7 @@ public class Downloader
*/
public int getDiffOfRange()
{
- int diff = Math.abs( (int) ( getEndOfRange() - getStartOfRange() ) );
+ int diff = Math.abs( getEndOfRange() - getStartOfRange() );
return diff;
}
@@ -240,11 +240,11 @@ public class Downloader
// First get length.
int retLengthByte;
retLengthByte = dataFromServer.read( incoming, 0, 1 );
- if ( retLengthByte != 1 ) {
+ if (retLengthByte != 1) {
this.close();
return false;
}
-
+
int length = incoming[0] & 0xFF;
log.info( "length (downloader): " + length );
@@ -312,7 +312,7 @@ public class Downloader
RandomAccessFile file = null;
try {
int length = getDiffOfRange();
- byte[] incoming = new byte[ 4000 ];
+ byte[] incoming = new byte[ 4000 ];
int hasRead = 0;
file = new RandomAccessFile( new File( outputFilename ), "rw" );
file.seek( getStartOfRange() );