diff --git a/src/main/java/org/olat/course/nodes/st/assessment/ConditionPassedEvaluator.java b/src/main/java/org/olat/course/nodes/st/assessment/ConditionPassedEvaluator.java index 1f525fc477bf7cfa379dd314ae38ff074b61e270..e0ced14bf1f943bb0a6ee21c04b4e2a4ee6e2b1a 100644 --- a/src/main/java/org/olat/course/nodes/st/assessment/ConditionPassedEvaluator.java +++ b/src/main/java/org/olat/course/nodes/st/assessment/ConditionPassedEvaluator.java @@ -81,7 +81,11 @@ public class ConditionPassedEvaluator implements PassedEvaluator { private RepositoryEntryLifecycle getRepositoryEntryLifecycle(RepositoryEntry courseEntry) { try { - return courseEntry.getLifecycle(); + RepositoryEntryLifecycle lifecycle = courseEntry.getLifecycle(); + if(lifecycle != null) { + lifecycle.getValidTo(); + } + return lifecycle; } catch (LazyInitializationException e) { RepositoryEntry reloadedEntry = CoreSpringFactory.getImpl(RepositoryService.class) .loadByKey(courseEntry.getKey()); diff --git a/src/main/java/org/olat/course/nodes/st/assessment/STRootPassedEvaluator.java b/src/main/java/org/olat/course/nodes/st/assessment/STRootPassedEvaluator.java index edf07c2e950aecff5971f2fcd5181677bea7cb16..043a797175fdd5a2e622b3b195c02e1cc3a0271b 100644 --- a/src/main/java/org/olat/course/nodes/st/assessment/STRootPassedEvaluator.java +++ b/src/main/java/org/olat/course/nodes/st/assessment/STRootPassedEvaluator.java @@ -155,6 +155,9 @@ public class STRootPassedEvaluator implements RootPassedEvaluator { if (courseEntry != null) { try { lifecycle = courseEntry.getLifecycle(); + if(lifecycle != null) { + lifecycle.getValidTo(); + } } catch (LazyInitializationException lie) { RepositoryService repositoryService = CoreSpringFactory.getImpl(RepositoryService.class); RepositoryEntry repositoryEntry = repositoryService.loadByKey(courseEntry.getKey());