diff options
author | Simon Rettberg | 2019-02-27 16:17:00 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-27 16:17:00 +0100 |
commit | 5094bd68c734f836cc437b66af4dbdfbfa5d033e (patch) | |
tree | 37770028f2bf8c646f0e5ac097444b27dfc4f21a /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | |
parent | [client] Fix array out of bounds with old servers (diff) | |
download | tutor-module-5094bd68c734f836cc437b66af4dbdfbfa5d033e.tar.gz tutor-module-5094bd68c734f836cc437b66af4dbdfbfa5d033e.tar.xz tutor-module-5094bd68c734f836cc437b66af4dbdfbfa5d033e.zip |
[server] Support loading/saving preset network rules
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java')
-rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java index a818a9ae..36bbea46 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java @@ -17,6 +17,7 @@ import org.openslx.bwlp.sat.database.mappers.DbImagePermissions; import org.openslx.bwlp.sat.database.mappers.DbLecture; import org.openslx.bwlp.sat.database.mappers.DbLectureFilter; import org.openslx.bwlp.sat.database.mappers.DbLectureNetshare; +import org.openslx.bwlp.sat.database.mappers.DbLectureNetworkRules; import org.openslx.bwlp.sat.database.mappers.DbLecturePermissions; import org.openslx.bwlp.sat.database.mappers.DbLocation; import org.openslx.bwlp.sat.database.mappers.DbLog; @@ -811,6 +812,12 @@ public class ServerHandler implements SatelliteServer.Iface { throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, "Database failure when querying predefined run scripts."); } + try { + data.networkExceptions = DbLectureNetworkRules.getPredefined(); + } catch (SQLException e) { + throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, + "Database failure when querying predefined network rules."); + } return data; } |