From d4a0f319e0c6da2a26268928ea51e1e09e47c37e Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Thu, 12 Mar 2020 08:20:19 +0100
Subject: [PATCH] OO-4402: Fixed redundant checks
---
.../accesscontrol/ui/AccessConfigurationController.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java b/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java
index 4059a7aabbd..6e71d54f935 100644
--- a/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java
+++ b/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java
@@ -417,11 +417,14 @@ public class AccessConfigurationController extends FormBasicController {
// Two unlimited bookin methods
if (aFrom == null && aTo == null && bFrom == null && bTo == null) {
overlap = true;
+ break;
// One unlimited method and one with start or end or both
} else if (aFrom == null && aTo == null && (bFrom != null || bTo != null)) {
overlap = true;
+ break;
} else if (aFrom == null && aTo != null && bFrom != null && aTo.compareTo(bFrom) >= 0) {
overlap = true;
+ break;
}
}
@@ -433,9 +436,14 @@ public class AccessConfigurationController extends FormBasicController {
bTo.compareTo(aTo) <= 0 &&
bTo.compareTo(aFrom) >= 0) {
overlap = true;
+ break;
}
}
}
+
+ if (overlap) {
+ break;
+ }
}
confControllerContainer.contextPut("overlappingConfigs", overlap);
confControllerContainer.setDirty(true);
--
GitLab