small changes

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java b/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java
index 0f28c39..0b22389 100644
--- a/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java
+++ b/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java
@@ -37,8 +37,8 @@ public class ThriftConnection
 	private static Logger log = Logger.getLogger( ThriftConnection.class );
 
 	/**
-	 * The method calls getConnection() to check if the connection is ok,
-	 * if so, it returns ftpCredential.
+	 * The method calls getConnection() to check if the connection is ok 
+	 * and to get the ServerSessionData. If connection is ok, it returns ftpCredential.
 	 * 
 	 * @return returns 'null' if there is a problem.
 	 */
@@ -122,6 +122,7 @@ public class ThriftConnection
 			String toEncrypt;
 			if ( theClient == null ) {
 				log.debug( "The client was null" );
+				return null;
 			}
 			try {
 				toEncrypt = theClient.startServerAuthentication( Globals.getPropertyString( PropString.THRIFTORGANIZATIONNAME) );
@@ -133,11 +134,11 @@ public class ThriftConnection
 				sSD = theClient.serverAuthenticate(
 						Globals.getPropertyString( PropString.THRIFTORGANIZATIONNAME), ByteBuffer.wrap( byteArray ) );
 			} catch ( ServerAuthenticationException e ) {
-				log.error( "ThriftConnection: Server Authetication was not sucessful." );
+				log.error( "ThriftConnection: ServerAuthenticationException: Server Authetication was not sucessful." );
 				e.printStackTrace();
 				return null;
 			} catch ( TException e ) {
-				log.error( "ThriftConnection: Server Authetication was not sucessful." );
+				log.error( "ThriftConnection: TExeption: Server Authetication was not sucessful." );
 				e.printStackTrace();
 				return null;
 			}