summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src
diff options
context:
space:
mode:
authorMichael Wilson2014-11-20 21:06:25 +0100
committerMichael Wilson2014-11-20 21:06:25 +0100
commit8711bc55a374bb564cb292aec69b5267f75eb310 (patch)
tree118884d52cb1ddbe17090abc74f753dfe96af4a5 /dozentenmodulserver/src
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-8711bc55a374bb564cb292aec69b5267f75eb310.tar.gz
tutor-module-8711bc55a374bb564cb292aec69b5267f75eb310.tar.xz
tutor-module-8711bc55a374bb564cb292aec69b5267f75eb310.zip
Fixed Bug: no new user possible --> query changed
Diffstat (limited to 'dozentenmodulserver/src')
-rw-r--r--dozentenmodulserver/src/main/java/server/ServerHandler.java1
-rw-r--r--dozentenmodulserver/src/main/java/sql/SQL.java7
-rw-r--r--dozentenmodulserver/src/main/java/thrift/MasterThriftConnection.java2
3 files changed, 6 insertions, 4 deletions
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index 03e713b7..5579e0ca 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -62,6 +62,7 @@ public class ServerHandler implements Server.Iface
// TODO Auto-generated catch block
e.printStackTrace();
}
+ log.info("User not authenticated.");
return false;
}
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java
index db23a90a..455b1e6d 100644
--- a/dozentenmodulserver/src/main/java/sql/SQL.java
+++ b/dozentenmodulserver/src/main/java/sql/SQL.java
@@ -283,7 +283,8 @@ public class SQL {
prest.setString(5, mail);
prest.setString(6, Institution);
- ResultSet rs = prest.executeQuery();
+ prest.executeUpdate();
+
con.commit();
sql = "SELECT userID FROM bwLehrpool.m_user where Nachname like "
@@ -296,8 +297,8 @@ public class SQL {
prest.setString(1, lastname);
prest.setString(2, firstname);
- rs = prest.executeQuery();
- con.commit();
+ ResultSet rs = prest.executeQuery();
+ con.commit();
rs.next();
String userid = rs.getString("userID");
con.close();
diff --git a/dozentenmodulserver/src/main/java/thrift/MasterThriftConnection.java b/dozentenmodulserver/src/main/java/thrift/MasterThriftConnection.java
index 6e5e6f61..a921e65f 100644
--- a/dozentenmodulserver/src/main/java/thrift/MasterThriftConnection.java
+++ b/dozentenmodulserver/src/main/java/thrift/MasterThriftConnection.java
@@ -31,7 +31,7 @@ public class MasterThriftConnection {
final TProtocol protocol = new TBinaryProtocol(transport);
final Client client = new Client(protocol);
- LOGGER.info("Masterserver '" + MASTERSERVER_IP + "' erreichbar.");
+ //LOGGER.info("Masterserver '" + MASTERSERVER_IP + "' erreichbar.");
return client;
}