diff options
| author | unknown | 2014-04-15 11:44:55 +0200 |
|---|---|---|
| committer | unknown | 2014-04-15 11:44:55 +0200 |
| commit | 2e0b5c8c8ff0ced260f1ce59c71d776b53f19c8e (patch) | |
| tree | 84220ae0a1fcb7e76129674fba39d6115762b6a0 /Dozentenmodul/src | |
| parent | g (diff) | |
| parent | Verbindung korrigiert (diff) | |
| download | tutor-module-2e0b5c8c8ff0ced260f1ce59c71d776b53f19c8e.tar.gz tutor-module-2e0b5c8c8ff0ced260f1ce59c71d776b53f19c8e.tar.xz tutor-module-2e0b5c8c8ff0ced260f1ce59c71d776b53f19c8e.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
Dozentenmodulserver/bin/server/ServerHandler.class
Dozentenmodulserver/src/server/ServerHandler.java
Diffstat (limited to 'Dozentenmodul/src')
| -rw-r--r-- | Dozentenmodul/src/gui/intro/Login_GUI.java | 2 | ||||
| -rw-r--r-- | Dozentenmodul/src/thrift/ThriftConnection.java | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index dcd90969..aa28b3b6 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -303,7 +303,7 @@ public class Login_GUI extends JFrame { // client has returned with error isClientReturnedCorrectly = false; System.out.println("Fehler: Client hat von Masterserver (" + masterServerIP - + ") hat keine korrekten Verbindungsdaten erhalten."); + + ") keine korrekten Verbindungsdaten erhalten."); } return isClientReturnedCorrectly; diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 648d8f86..058128a4 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -1,5 +1,7 @@ package thrift; +import models.SessionData; + import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TSocket; @@ -10,7 +12,9 @@ import server.Server; import server.Server.Client; public class ThriftConnection { - final TTransport transport = new TSocket("141.79.128.121", 9090); + + private String satAddress = ""+SessionData.session.getServerAdress(); + final TTransport transport = new TSocket(satAddress, 9090); //final TTransport transport = new TSocket("141.79.128.102", 9090); public Client getThriftConnection() { @@ -26,7 +30,7 @@ public class ThriftConnection { final Server.Client client = new Server.Client(protocol); - System.out.println("Verbindung wurde aufgebaut."); + System.out.println("Verbindung wurde aufgebaut. Satellit="+satAddress); return client; } |