Skip to content
Snippets Groups Projects
Commit d9b1d695 authored by srosse's avatar srosse
Browse files

OO-716, OO-936: fix RS by NullPointerException

parent 87f2721d
No related branches found
No related tags found
No related merge requests found
...@@ -270,8 +270,12 @@ public class CheckListRunController extends FormBasicController implements Contr ...@@ -270,8 +270,12 @@ public class CheckListRunController extends FormBasicController implements Contr
theOne = wrapper.getDbCheckbox(); theOne = wrapper.getDbCheckbox();
} }
Float score;
Float score = checked ? wrapper.getCheckbox().getPoints() : 0f; if(checked) {
score = wrapper.getCheckbox().getPoints();
} else {
score = 0f;
}
checkboxManager.check(theOne, getIdentity(), score, new Boolean(checked)); checkboxManager.check(theOne, getIdentity(), score, new Boolean(checked));
//make sure all results is on the database before calculating some scores //make sure all results is on the database before calculating some scores
//manager commit already DBFactory.getInstance().commit(); //manager commit already DBFactory.getInstance().commit();
......
...@@ -22,6 +22,7 @@ package org.olat.ims.qti.statistics.manager; ...@@ -22,6 +22,7 @@ package org.olat.ims.qti.statistics.manager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -488,7 +489,7 @@ public class QTIStatisticsManagerImpl implements QTIStatisticsManager { ...@@ -488,7 +489,7 @@ public class QTIStatisticsManagerImpl implements QTIStatisticsManager {
List<Object[]> results = query.getResultList(); List<Object[]> results = query.getResultList();
if(results.isEmpty()) { if(results.isEmpty()) {
return null; return Collections.emptyList();
} }
List<StatisticAnswerOption> answerToNumberList = new ArrayList<>(); List<StatisticAnswerOption> answerToNumberList = new ArrayList<>();
...@@ -516,7 +517,7 @@ public class QTIStatisticsManagerImpl implements QTIStatisticsManager { ...@@ -516,7 +517,7 @@ public class QTIStatisticsManagerImpl implements QTIStatisticsManager {
List<Object[]> results = query.getResultList(); List<Object[]> results = query.getResultList();
if(results.isEmpty()) { if(results.isEmpty()) {
return null; return Collections.emptyList();
} }
Map<String, Item> identToItemMap = new HashMap<>(); Map<String, Item> identToItemMap = new HashMap<>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment