fix null pointer exception

ls1intum · Feb 3, 2019 · e68fdfa · e68fdfa
1 parent 779da56
commit e68fdfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ShortAnswerQuestionStatistic.java b/src/main/java/de/tum/in/www1/artemis/domain/ShortAnswerQuestionStatistic.java
@@ -175,8 +175,11 @@ private void changeStatisticBasedOnResult(SubmittedAnswer submittedAnswer, boole
                     shortAnswerSubmittedText = shortAnswerSubmittedAnswer.getSubmittedTextForSpot(spotCounter.getSpot());
                     shortAnswerSolutions = spotCounter.getSpot().getQuestion().getCorrectSolutionForSpot(spotCounter.getSpot());
 
-                    for(ShortAnswerSolution solution : shortAnswerSolutions){
-                        if(shortAnswerSubmittedText.isSubmittedTextCorrect(shortAnswerSubmittedText.getText(), solution.getText()) && shortAnswerSubmittedText.isIsCorrect()){
+                    if (shortAnswerSubmittedText == null) {
+                        continue;
+                    }
+                    for(ShortAnswerSolution solution : shortAnswerSolutions) {
+                        if(shortAnswerSubmittedText.isSubmittedTextCorrect(shortAnswerSubmittedText.getText(), solution.getText()) && Boolean.TRUE == shortAnswerSubmittedText.isIsCorrect()){
                             spotCounter.setUnRatedCounter(spotCounter.getUnRatedCounter() + change);
                         }
                     }

diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ShortAnswerSubmittedAnswer.java b/src/main/java/de/tum/in/www1/artemis/domain/ShortAnswerSubmittedAnswer.java
@@ -111,7 +111,7 @@ public boolean submittedTextMoreThanOnceInSubmittedAnswer(ShortAnswerSubmittedTe
     }
 
     public ShortAnswerSubmittedText getSubmittedTextForSpot(ShortAnswerSpot spot) {
-        for(ShortAnswerSubmittedText submittedText : this.getSubmittedTexts()){
+        for(ShortAnswerSubmittedText submittedText : this.getSubmittedTexts()) {
             if(submittedText.getSpot().equals(spot)) {
                 return submittedText;
             }