From 5094bd68c734f836cc437b66af4dbdfbfa5d033e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 27 Feb 2019 16:17:00 +0100 Subject: [server] Support loading/saving preset network rules --- .../src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java') 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; } -- cgit v1.2.3-55-g7522