(WiP) Global image sync

1 files changed, 5 insertions, 6 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
index 8e615ef1..ed8cbb7e 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
@@ -60,7 +60,7 @@ public class App {
 			LOGGER.fatal("Could not load configuration", e1);
 			System.exit(1);
 		}
-		
+
 		// Update database schema if applicable
 		try {
 			Updater.updateDatabase();
@@ -68,7 +68,7 @@ public class App {
 			LOGGER.fatal("Updating/checking the database layout failed.");
 			return;
 		}
-		
+
 		if (Identity.loadCertificate() == null) {
 			LOGGER.error("Could not set up TLS/SSL requirements, exiting");
 			System.exit(1);
@@ -100,8 +100,7 @@ public class App {
 
 		SSLContext ctx = null;
 		if (Configuration.getMasterServerSsl()) {
-			ctx = SSLContext.getInstance("TLSv1.2");
-			ctx.init(null, null, null);
+			ctx = Configuration.getMasterServerSslContext();
 		}
 		ThriftManager.setMasterServerAddress(ctx, Configuration.getMasterServerAddress(),
 				Configuration.getMasterServerPort(), 30000);
@@ -114,12 +113,12 @@ public class App {
 		}
 		if (OrganizationList.get() == null || OrganizationList.get().isEmpty()) {
 			LOGGER.fatal("Could not get initial organization list from master server."
-				+ " Please make sure this server can connect to the internet.");
+					+ " Please make sure this server can connect to the internet.");
 			return;
 		}
 		if (OperatingSystemList.get() == null || OperatingSystemList.get().isEmpty()) {
 			LOGGER.fatal("Could not get initial operating system list from master server."
-				+ " Please make sure this server can connect to the internet.");
+					+ " Please make sure this server can connect to the internet.");
 			return;
 		}