1 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java
index 18296c5..ad2e96c 100644
--- a/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java
+++ b/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java
@@ -6,7 +6,8 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.filetransfer.Uploader;
 
@@ -17,7 +18,7 @@ public abstract class OutgoingTransferBase extends AbstractTransfer
 	 * Constants
 	 */
 
-	private static final Logger LOGGER = Logger.getLogger( OutgoingTransferBase.class );
+	private static final Logger LOGGER = LogManager.getLogger( OutgoingTransferBase.class );
 
 	private static final long INACTIVITY_TIMEOUT = TimeUnit.MINUTES.toMillis( 5 );
 
@@ -74,9 +75,13 @@ public abstract class OutgoingTransferBase extends AbstractTransfer
 				@Override
 				public void run()
 				{
-					boolean ret = connection.upload( sourceFile.getAbsolutePath() );
-					synchronized ( uploads ) {
-						uploads.remove( connection );
+					boolean ret = false;
+					try {
+						ret = connection.upload( sourceFile.getAbsolutePath() );
+					} finally {
+						synchronized ( uploads ) {
+							uploads.remove( connection );
+						}
 					}
 					if ( ret ) {
 						connectFails.set( 0 );