SCORM SCO-169: protect against possible NPE when accessing existing g…

…radebook comment (sakaiproject#49)
punkjoker · Apr 11, 2024 · c706438 · c706438
1 parent aa6566a
commit c706438
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...mpl/service/src/java/org/sakaiproject/scorm/service/impl/ScormApplicationServiceImpl.java b/...mpl/service/src/java/org/sakaiproject/scorm/service/impl/ScormApplicationServiceImpl.java
@@ -18,7 +18,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.OptionalDouble;
 import java.util.Properties;
 
@@ -65,6 +64,7 @@
 import org.sakaiproject.scorm.service.api.LearningManagementSystem;
 import org.sakaiproject.scorm.service.api.ScormApplicationService;
 import org.sakaiproject.scorm.service.api.ScormSequencingService;
+import org.sakaiproject.service.gradebook.shared.CommentDefinition;
 import org.sakaiproject.service.gradebook.shared.GradebookExternalAssessmentService;
 import org.sakaiproject.service.gradebook.shared.GradebookService;
 import org.sakaiproject.util.ResourceLoader;
@@ -1387,7 +1387,8 @@ protected void updateGradebook(OptionalDouble score, String context, String lear
 		{
 			GradebookService gbService = gradebookService();
 			long internalAssessmentID = gbeService.getInternalAssessmentID(context, externalAssessmentID).orElse(-1l);
-			String existingComment = Optional.ofNullable(gbService.getAssignmentScoreComment(context, internalAssessmentID, learnerID).getCommentText()).filter(c -> !c.isEmpty()).orElse("");
+			CommentDefinition cd = gbService.getAssignmentScoreComment(context, internalAssessmentID, learnerID);
+			String existingComment = cd != null ? StringUtils.trimToEmpty(cd.getCommentText()) : "";
 			String moduleNoScoreRecorded = resourceLoader.getString("moduleNoScoreRecorded");
 
 			if (score.isPresent()) // Module recorded a score...