Merge pull request sakaiproject#808 from lorenamgUMU/SAM-2567

SAM-2567 Stack trace when exporting assessment results which have unanswered calculated questions
jayrp11 · Jul 6, 2015 · e8e3f72 · e8e3f72
2 parents e969fcc + 7343750
commit e8e3f72
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...p/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/HistogramListener.java b/...p/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/HistogramListener.java
@@ -1827,7 +1827,7 @@ private void getCalculatedQuestionScores(List<ItemGradingData> scores, Histogram
     results.put(INCORRECT, Integer.valueOf(0));
 
     for (ItemGradingData score : scores) {
-        if (score.getAutoScore() > 0) {
+        if (score.getAutoScore() != null && score.getAutoScore() > 0) {
             Integer value = results.get(CORRECT);
             results.put(CORRECT, ++value);
         } else {
@@ -1866,7 +1866,7 @@ private void getCalculatedQuestionScores(List<ItemGradingData> scores, Histogram
     // us a count of assessmnets that had an incorrect answer 
     Set<Long> assessmentQuestionIncorrect = new HashSet<Long>();
     for (ItemGradingData score : scores) {
-        if (score.getAutoScore() == 0) {
+        if (score.getAutoScore() == null || score.getAutoScore() == 0) {
             assessmentQuestionIncorrect.add(score.getAssessmentGradingId());
         }
     }