[server] Fix transfer timeout detection and active counting

1 files changed, 4 insertions, 6 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
index b01a627f..917611c7 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
@@ -14,11 +14,6 @@ public class OutgoingDataTransfer extends AbstractTransfer {
 	private static final Logger LOGGER = Logger.getLogger(OutgoingDataTransfer.class);
 
 	/**
-	 * How many concurrent connections per download
-	 */
-	private static final int MAX_CONNECTIONS = Math.min(4, Math.max(Constants.MAX_DOWNLOADS / 4, 1));
-
-	/**
 	 * Remote peer is downloading, so we have Uploaders
 	 */
 	private List<Uploader> uploads = new ArrayList<>();
@@ -53,7 +48,7 @@ public class OutgoingDataTransfer extends AbstractTransfer {
 			return false;
 		potentialFinishTime.set(0);
 		synchronized (uploads) {
-			if (uploads.size() > MAX_CONNECTIONS)
+			if (uploads.size() > Constants.MAX_CONNECTIONS_PER_TRANSFER)
 				return false;
 			uploads.add(connection);
 		}
@@ -74,6 +69,9 @@ public class OutgoingDataTransfer extends AbstractTransfer {
 			});
 		} catch (Exception e) {
 			LOGGER.warn("threadpool rejected the incoming file transfer", e);
+			synchronized (uploads) {
+				uploads.remove(connection);
+			}
 			return false;
 		}
 		return true;