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 4059a7aabbd55595ea33f9f32127ee1dd4eeec37..6e71d54f935d9fc64d933da7bc475ef465b91ca8 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);