diff options
| author | unknown | 2014-05-17 17:48:02 +0200 |
|---|---|---|
| committer | unknown | 2014-05-17 17:48:02 +0200 |
| commit | dd96e8d4543ad8887af1cb2d8877f9f8fb830fa1 (patch) | |
| tree | f5aa67beb61638103f0667384bee18c82f5a50c4 /Dozentenmodul/src/thrift/ThriftConnection.java | |
| parent | asdfdsgdfgdfh (diff) | |
| parent | nix (diff) | |
| download | tutor-module-dd96e8d4543ad8887af1cb2d8877f9f8fb830fa1.tar.gz tutor-module-dd96e8d4543ad8887af1cb2d8877f9f8fb830fa1.tar.xz tutor-module-dd96e8d4543ad8887af1cb2d8877f9f8fb830fa1.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
fdghf
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class
Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class
Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
Dozentenmodul/src/gui/image/DeleteImage_GUI.java
Diffstat (limited to 'Dozentenmodul/src/thrift/ThriftConnection.java')
| -rw-r--r-- | Dozentenmodul/src/thrift/ThriftConnection.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 7652fbe7..dcd441bc 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -17,7 +17,11 @@ public class ThriftConnection { private String satAddress = ""+SessionData.session.getServerAdress(); final TTransport transport = new TSocket(satAddress, 9090); - //final TTransport transport = new TSocket("141.79.128.102", 9090); + + public ThriftConnection() { + // TODO Auto-generated constructor stub + } + public Client getThriftConnection() { @@ -34,6 +38,7 @@ public class ThriftConnection { } final TProtocol protocol = new TBinaryProtocol(transport); + final Server.Client client = new Server.Client(protocol); System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut."); |