[server] Tweaks/fixes to file transfers

1 files changed, 7 insertions, 5 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
index 6053aa74..a8023989 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
@@ -139,7 +139,7 @@ public class FileServer implements IncomingEvent {
 				continue;
 			}
 			if (upload.countsTowardsConnectionLimit(now)) {
-				activeUploads += Math.max(1, upload.getActiveConnectionCount());
+				activeUploads += 1;
 			}
 		}
 		if (activeUploads >= Constants.MAX_UPLOADS) {
@@ -191,7 +191,7 @@ public class FileServer implements IncomingEvent {
 				continue;
 			}
 			if (download.countsTowardsConnectionLimit(now)) {
-				activeDownloads += Math.max(1, download.getActiveConnectionCount());
+				activeDownloads += 1;
 			}
 		}
 		if (activeDownloads >= Constants.MAX_DOWNLOADS) {
@@ -217,9 +217,11 @@ public class FileServer implements IncomingEvent {
 			errorMessage = "File corrupted on server";
 		}
 		if (errorMessage != null) {
-			try {
-				DbImage.markValid(false, true, localImageData);
-			} catch (SQLException e) {
+			if (localImageData.isValid) {
+				try {
+					DbImage.markValid(false, true, localImageData);
+				} catch (SQLException e) {
+				}
 			}
 			throw new TTransferRejectedException(errorMessage);
 		}