summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/thrift/ThriftConnection.java
diff options
context:
space:
mode:
authorunknown2014-04-10 16:50:14 +0200
committerunknown2014-04-10 16:50:14 +0200
commit236f2e7bf2c9d5cdec6da36140ee7dcac7944998 (patch)
tree2de499a71a527c7320b2096c17c5a69d2ea8d288 /Dozentenmodul/src/thrift/ThriftConnection.java
parentbfg (diff)
parentcdsc (diff)
downloadtutor-module-236f2e7bf2c9d5cdec6da36140ee7dcac7944998.tar.gz
tutor-module-236f2e7bf2c9d5cdec6da36140ee7dcac7944998.tar.xz
tutor-module-236f2e7bf2c9d5cdec6da36140ee7dcac7944998.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts: Dozentenmodul/src/GUI/SearchImage_GUI.java Dozentenmodul/src/Models/person.java Dozentenmodul/src/Models/vm.java
Diffstat (limited to 'Dozentenmodul/src/thrift/ThriftConnection.java')
-rw-r--r--Dozentenmodul/src/thrift/ThriftConnection.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java
index 21baff96..311125f5 100644
--- a/Dozentenmodul/src/thrift/ThriftConnection.java
+++ b/Dozentenmodul/src/thrift/ThriftConnection.java
@@ -10,7 +10,8 @@ import server.Server;
import server.Server.Client;
public class ThriftConnection {
- final TTransport transport = new TSocket("141.79.128.121", 9090);
+ //final TTransport transport = new TSocket("141.79.128.121", 9090);
+ final TTransport transport = new TSocket("141.79.128.102", 9090);
public Client getThriftConnection()
{
@@ -25,13 +26,14 @@ public class ThriftConnection {
final Server.Client client = new Server.Client(protocol);
- System.out.println("Der Server läuft!");
+ System.out.println("Verbindung wurde aufgebaut.");
return client;
}
public void closeThriftConnection()
{
+ System.out.println("Verbindung wird geplant getrennt...");
transport.close();
}
}