[server] Fix transfer timeout detection and active counting

1 files changed, 7 insertions, 9 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
index 4dc69c03..97c076c9 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
@@ -45,11 +45,6 @@ public class IncomingDataTransfer extends AbstractTransfer implements HashCheckC
 	private static final Logger LOGGER = Logger.getLogger(IncomingDataTransfer.class);
 
 	/**
-	 * How many concurrent connections per upload
-	 */
-	private static final int MAX_CONNECTIONS = Math.min(4, Math.max(Constants.MAX_UPLOADS / 4, 1));
-
-	/**
 	 * Self reference for inner classes.
 	 */
 	private final IncomingDataTransfer activeUpload = this;
@@ -235,7 +230,7 @@ public class IncomingDataTransfer extends AbstractTransfer implements HashCheckC
 		if (state == TransferState.FINISHED || state == TransferState.ERROR)
 			return false;
 		synchronized (downloads) {
-			if (downloads.size() >= MAX_CONNECTIONS)
+			if (downloads.size() >= Constants.MAX_CONNECTIONS_PER_TRANSFER)
 				return false;
 			downloads.add(connection);
 		}
@@ -261,13 +256,16 @@ public class IncomingDataTransfer extends AbstractTransfer implements HashCheckC
 					}
 				}
 			});
-			if (state == TransferState.IDLE) {
-				state = TransferState.WORKING;
-			}
 		} catch (Exception e) {
 			LOGGER.warn("threadpool rejected the incoming file transfer", e);
+			synchronized (downloads) {
+				downloads.remove(connection);
+			}
 			return false;
 		}
+		if (state == TransferState.IDLE) {
+			state = TransferState.WORKING;
+		}
 		return true;
 	}