summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-03-07 15:59:27 +0100
committerSimon Rettberg2019-03-07 15:59:27 +0100
commitfda45cb6e80945f0e22ab0002facfa37ab40fede (patch)
tree1d64bb26588c146b0b4b046cae60fa8ddb8efc11
parent[client] Fix StateWrapper.equals() method (diff)
downloadtutor-module-fda45cb6e80945f0e22ab0002facfa37ab40fede.tar.gz
tutor-module-fda45cb6e80945f0e22ab0002facfa37ab40fede.tar.xz
tutor-module-fda45cb6e80945f0e22ab0002facfa37ab40fede.zip
[server] Fix: Client gets disabled network shares on vm start
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
index 30843d31..0e132712 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
@@ -59,7 +59,7 @@ public class DbLectureNetshare {
MysqlStatement netsharestmt = connection.prepareStatement(
"SELECT pns.shareid, IFNULL(pns.sharedata, ns.sharedata) AS sharedata FROM networkshare ns"
+ " LEFT JOIN presetnetworkshare pns ON (ns.sharepresetid = pns.shareid)"
- + " WHERE ns.lectureid = :lectureid");
+ + " WHERE ns.lectureid = :lectureid AND (pns.active IS NULL OR pns.active <> 0)");
netsharestmt.setString("lectureid", lectureId);
ResultSet rs = netsharestmt.executeQuery();
while (rs.next()) {