From eaa0e5dcb9e506720fff48ae1efbb07579342471 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 17 Sep 2014 16:33:51 +0200
Subject: Add debugging to file transfer

---
 .../java/org/openslx/filetransfer/Uploader.java    | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'src/main/java/org/openslx/filetransfer/Uploader.java')

diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java
index 90d9ba2..3deb272 100644
--- a/src/main/java/org/openslx/filetransfer/Uploader.java
+++ b/src/main/java/org/openslx/filetransfer/Uploader.java
@@ -64,14 +64,14 @@ public class Uploader extends Transfer
 	 */
 	public boolean sendFile( String filename )
 	{
+		if ( getStartOfRange() == -1 ) {
+			this.close( "sendFile called when no range is set" );
+			return false;
+		}
+
 		RandomAccessFile file = null;
 		try {
 			file = new RandomAccessFile( new File( filename ), "r" );
-
-			if ( getStartOfRange() == -1 ) {
-				this.close();
-				return false;
-			}
 			file.seek( getStartOfRange() );
 
 			byte[] data = new byte[ 64000 ];
@@ -81,9 +81,8 @@ public class Uploader extends Transfer
 			while ( hasRead < length ) {
 				int ret = file.read( data, 0, Math.min( length - hasRead, data.length ) );
 				if ( ret == -1 ) {
-					log.warn( "Error occured in Uploader.sendFile(),"
+					this.close( "Error occured in Uploader.sendFile(),"
 							+ " while reading from File to send." );
-					this.close();
 					return false;
 				}
 				hasRead += ret;
@@ -92,25 +91,23 @@ public class Uploader extends Transfer
 		} catch ( SocketTimeoutException ste ) {
 			ste.printStackTrace();
 			sendErrorCode( "timeout" );
-			log.warn( "Socket timeout occured ... close connection." );
-			this.close();
+			this.close( "Socket timeout occured ... close connection." );
 			return false;
 		} catch ( IOException ioe ) {
 			ioe.printStackTrace();
 			readMetaData();
 			if ( ERROR != null ) {
-				if ( ERROR == "timeout" ) {
-					log.warn( "Socket timeout occured ... close connection." );
-					this.close();
+				if ( ERROR.equals( "timeout" ) ) {
+					this.close( "Remote Socket timeout occured ... close connection." );
+					return false;
 				}
 			}
-			log.warn( "Sending RANGE " + getStartOfRange() + ":" + getEndOfRange() + " of File "
+			this.close( "Sending RANGE " + getStartOfRange() + ":" + getEndOfRange() + " of File "
 					+ filename + " failed..." );
-			this.close();
 			return false;
 		} catch ( Exception e ) {
 			e.printStackTrace();
-			this.close();
+			this.close( e.toString() );
 			return false;
 		} finally {
 			if ( file != null ) {
-- 
cgit v1.2.3-55-g7522