summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/thrift
diff options
context:
space:
mode:
authorNino Breuer2014-11-28 16:07:58 +0100
committerNino Breuer2014-11-28 16:07:58 +0100
commitc27d50c575ff5867aef8f10ccf2b5f2ac43dae08 (patch)
tree5c2e6586338308ce49e21272931e2341ae7d47ec /dozentenmodul/src/main/java/thrift
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-c27d50c575ff5867aef8f10ccf2b5f2ac43dae08.tar.gz
tutor-module-c27d50c575ff5867aef8f10ccf2b5f2ac43dae08.tar.xz
tutor-module-c27d50c575ff5867aef8f10ccf2b5f2ac43dae08.zip
• changed implementation of user authentication.
• changed position of class file • fixed some little things (not necessary to mention) Important Notes: •organizationID in token returns "wrong" values, therefore university is still set by client. To be fixed someday. • userID is the value with which the user starts his log in. this value is not represented in the token! (as it is not(!) the email). To be implemented someday, as this value is represented in the masterserver. • Feature isn't well tested.
Diffstat (limited to 'dozentenmodul/src/main/java/thrift')
-rw-r--r--dozentenmodul/src/main/java/thrift/MasterThriftConnection.java2
-rw-r--r--dozentenmodul/src/main/java/thrift/ThriftConnection.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
index 7c1259f9..a5df03c2 100644
--- a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
@@ -35,7 +35,7 @@ public class MasterThriftConnection {
return client;
}
-
+
public void closeMasterThriftConnection() {
transport.close();
}
diff --git a/dozentenmodul/src/main/java/thrift/ThriftConnection.java b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
index 50315ae5..8b0221e8 100644
--- a/dozentenmodul/src/main/java/thrift/ThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
@@ -49,6 +49,7 @@ public class ThriftConnection {
public void closeThriftConnection()
{
+ //System.out.println("Ich funktioniere auch, wenn ich nicht geschlossen, sondern im TaskManager gekillt werde"); //works
LOGGER.info("Verbindung wird geplant getrennt.");
transport.close();
}