summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
diff options
context:
space:
mode:
authorJonathan Bauer2016-10-20 16:27:47 +0200
committerJonathan Bauer2016-10-20 16:27:47 +0200
commitef6eeaf6937dab8b34c23a1ccfc176d9e9441652 (patch)
tree21476d8810e8b8ebfaab8728120e67af4c02865d /dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
parent[client] check if we are in gui thread and directly show message box instead ... (diff)
downloadtutor-module-ef6eeaf6937dab8b34c23a1ccfc176d9e9441652.tar.gz
tutor-module-ef6eeaf6937dab8b34c23a1ccfc176d9e9441652.tar.xz
tutor-module-ef6eeaf6937dab8b34c23a1ccfc176d9e9441652.zip
[client] return to login/sat select window on thrift errors
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
index fc5af070..5b57bcea 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
@@ -154,7 +154,6 @@ public class ThriftActions {
// try to get a new client
client = ThriftManager.getNewSatelliteClient(GraphicalCertHandler.getSslContext(address),
address, App.THRIFT_SSL_PORT, 5000);
-
// RPC version check
if (client != null) {
try {
@@ -171,6 +170,9 @@ public class ThriftActions {
"Authentifizierung erfolgreich, die Verbindung zum Satelliten-Server ist jedoch nicht möglich.\n\n"
+ "Möglicherweise ist der Server nicht verfügbar, oder die Netzwerkverbindung gestört.",
MessageType.ERROR, null, null);
+ if (data.satellites.size() == 1) {
+ return false;
+ }
continue;
}
return false;