summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-08-20 12:47:25 +0200
committerSimon Rettberg2015-08-20 12:47:25 +0200
commit82712b2a52cd45ddba8bae02d4b783e38471b51f (patch)
tree3e579be2db024c80d6eb5746ad3c9ce40eb56c91 /dozentenmodul/src/main/java/org/openslx/dozmod/App.java
parent[client] Cancel hash generator if upload fails (diff)
downloadtutor-module-82712b2a52cd45ddba8bae02d4b783e38471b51f.tar.gz
tutor-module-82712b2a52cd45ddba8bae02d4b783e38471b51f.tar.xz
tutor-module-82712b2a52cd45ddba8bae02d4b783e38471b51f.zip
[client] One error callback for master and sat connection
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/App.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/App.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index 4be5a34d..29721387 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -150,15 +150,18 @@ public class App {
// setup global thrift connection error handler before anything else
// Set master server to use (TODO: make configurable via command line)
try {
- ThriftManager.setMasterServerAddress(SSLContext.getDefault(), "bwlp-masterserver.ruf.uni-freiburg.de", THRIFT_SSL_PORT,
- THRIFT_TIMEOUT_MS);
+ ThriftManager.setMasterServerAddress(SSLContext.getDefault(),
+ "bwlp-masterserver.ruf.uni-freiburg.de", THRIFT_SSL_PORT, THRIFT_TIMEOUT_MS);
} catch (final NoSuchAlgorithmException e1) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
Gui.showMessageBox(null, "SSL nicht verfügbar", MessageType.ERROR, LOGGER, e1);
+ // TODO: Ask if user wants to establish plain connection, quit otherwise
+ System.exit(1);
}
});
+ return;
}
SwingUtilities.invokeLater(new Runnable() {