From 1b08ec0c5f00b03a10768c9dd437c60590e6ccec Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 2 Aug 2019 21:07:23 +0200
Subject: [PATCH] no-jira: fix NPE in score calculation
---
.../org/olat/course/run/scoring/ScoreCalculator.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java b/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java
index 87b06fcd10d..10d34ea998e 100644
--- a/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java
+++ b/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java
@@ -111,11 +111,11 @@ public class ScoreCalculator implements Serializable {
* @return
*/
public String getScoreExpressionFromEasyModeConfiguration() {
- if (getSumOfScoreNodes() != null && getSumOfScoreNodes().size() > 0) {
- switch (scoreType) {
- case SCORE_TYPE_SUM: return getSumScoreExpression();
- case SCORE_TYPE_AVG: return getAvgScoreExpression();
- default: //
+ if (getSumOfScoreNodes() != null && !getSumOfScoreNodes().isEmpty()) {
+ if(scoreType == null || SCORE_TYPE_SUM.equals(scoreType)) {
+ return getSumScoreExpression();
+ } else if(SCORE_TYPE_AVG.equals(scoreType)) {
+ return getAvgScoreExpression();
}
}
return null;
--
GitLab