summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/App.java')
-rwxr-xr-xdozentenmodul/src/main/java/org/openslx/dozmod/App.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index 9ef3f7b9..e6e272da 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -15,7 +15,6 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.zip.Deflater;
-import javax.net.ssl.SSLContext;
import javax.swing.SwingUtilities;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
@@ -237,10 +236,9 @@ public class App {
}
// SSL
if (useSsl) {
+ waitForInit();
try {
- SSLContext ctx = SSLContext.getInstance("TLSv1.2");
- ctx.init(null, null, null);
- ThriftManager.setMasterServerAddress(ctx, host, port, THRIFT_TIMEOUT_MS);
+ ThriftManager.setMasterServerAddress(ProxyConfigurator.getThriftSslContext(), host, port, THRIFT_TIMEOUT_MS);
} catch (final Exception e1) {
SwingUtilities.invokeAndWait(new Runnable() {
@Override