From f1e7a18bd4b765bd15c3fb1bf445447b8046ca99 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 31 Jan 2017 09:25:36 +0100
Subject: [PATCH] OO-2480: node attempts must return a value, default is zero
---
.../course/assessment/manager/CourseAssessmentManagerImpl.java | 2 +-
src/main/java/org/olat/course/nodes/iq/IQRunController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
index 28d14c6ab48..60930b7ffeb 100644
--- a/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
+++ b/src/main/java/org/olat/course/assessment/manager/CourseAssessmentManagerImpl.java
@@ -388,7 +388,7 @@ public class CourseAssessmentManagerImpl implements AssessmentManager {
AssessmentEntry nodeAssessment = assessmentService
.loadAssessmentEntry(identity, cgm.getCourseEntry(), courseNode.getIdent());
- return nodeAssessment == null ? INTEGER_ZERO : nodeAssessment.getAttempts();
+ return nodeAssessment == null || nodeAssessment.getAttempts() == null ? INTEGER_ZERO : nodeAssessment.getAttempts();
}
@Override
diff --git a/src/main/java/org/olat/course/nodes/iq/IQRunController.java b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
index 989f4eedc62..7823c0f44be 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
@@ -610,7 +610,7 @@ public class IQRunController extends BasicController implements GenericEventList
myContent.contextPut("passed", assessmentEntry.getPassed());
StringBuilder comment = Formatter.stripTabsAndReturns(assessmentEntry.getComment());
myContent.contextPut("comment", StringHelper.xssScan(comment));
- myContent.contextPut("attempts", assessmentEntry.getAttempts());
+ myContent.contextPut("attempts", assessmentEntry.getAttempts() == null ? 0 : assessmentEntry.getAttempts());
}
}
--
GitLab