1 files changed, 8 insertions, 8 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 fe521691..2b1e3d18 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
@@ -164,23 +164,23 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 			if (getActiveConnectionCount() >= 1)
 				return;
 			Downloader downloader = null;
-			if (masterTransferInfo.plainPort != 0) {
+			if (downloader == null && masterTransferInfo.sslPort != 0) {
 				try {
 					downloader = new Downloader(Configuration.getMasterServerAddress(),
-							masterTransferInfo.plainPort, Constants.TRANSFER_TIMEOUT, null,
+							masterTransferInfo.sslPort, Constants.TRANSFER_TIMEOUT, SSLContext.getDefault(),
 							masterTransferInfo.token);
-				} catch (Exception e1) {
-					LOGGER.debug("Plain connect failed", e1);
+				} catch (Exception e2) {
+					LOGGER.debug("SSL connect failed", e2);
 					downloader = null;
 				}
 			}
-			if (downloader == null && masterTransferInfo.sslPort != 0) {
+			if (downloader == null && masterTransferInfo.plainPort != 0) {
 				try {
 					downloader = new Downloader(Configuration.getMasterServerAddress(),
-							masterTransferInfo.sslPort, Constants.TRANSFER_TIMEOUT, SSLContext.getDefault(), // TODO: Use the TLSv1.2 one once the master is ready
+							masterTransferInfo.plainPort, Constants.TRANSFER_TIMEOUT, null,
 							masterTransferInfo.token);
-				} catch (Exception e2) {
-					LOGGER.debug("SSL connect failed", e2);
+				} catch (Exception e1) {
+					LOGGER.debug("Plain connect failed", e1);
 					downloader = null;
 				}
 			}