summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2017-11-20 16:42:50 +0100
committerSimon Rettberg2017-11-20 16:42:50 +0100
commitc994425b9e78900015760fd297df16dd4fe7877e (patch)
tree8bc1ea419b967db2f288ca90b8487684af86d216
parent[client] Add null-check to work around bug in some java 8 versions (patch lev... (diff)
downloadtutor-module-c994425b9e78900015760fd297df16dd4fe7877e.tar.gz
tutor-module-c994425b9e78900015760fd297df16dd4fe7877e.tar.xz
tutor-module-c994425b9e78900015760fd297df16dd4fe7877e.zip
[server] Don't reset maxLocationsPerLecture to 4 all the time
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java
index 05a899b0..ea3c7ae0 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java
@@ -25,6 +25,7 @@ public class RuntimeConfig {
}
if (satConfig == null) {
satConfig = new SatelliteConfig();
+ satConfig.maxLocationsPerLecture = -1;
}
if (satConfig.defaultImagePermissions == null) {
satConfig.setDefaultImagePermissions(new ImagePermissions(true, true, false, false));
@@ -50,7 +51,9 @@ public class RuntimeConfig {
}
satConfig.setPageSize(Paginator.PER_PAGE);
satConfig.setMaxConnectionsPerTransfer(Constants.MAX_CONNECTIONS_PER_TRANSFER);
- satConfig.setMaxLocationsPerLecture(4);
+ if (satConfig.maxLocationsPerLecture == -1) {
+ satConfig.setMaxLocationsPerLecture(4);
+ }
if (!satConfig.equals(readConfig)) {
try {
DbConfiguration.setSatelliteConfig(satConfig);