SAK-33868 Gradbook Classic GradeEvent returns null vs empty list (sak…

…aiproject#5265)
DaweiXia · Jan 31, 2018 · fd8fab2 · fd8fab2
1 parent f31bc02
commit fd8fab2
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...s/gradebook-service/hibernate/src/java/org/sakaiproject/tool/gradebook/GradingEvents.java b/...s/gradebook-service/hibernate/src/java/org/sakaiproject/tool/gradebook/GradingEvents.java
@@ -27,11 +27,7 @@
  * @author <a href="mailto:[email protected]">Josh Holtzman</a>
  */
 public class GradingEvents implements Serializable {
-    protected Map<String, List<GradingEvent>> studentsToEventsMap;
-
-    public GradingEvents() {
-        studentsToEventsMap = new HashMap<>();
-    }
+    private Map<String, List<GradingEvent>> studentsToEventsMap = new HashMap<>();
 
     /**
      * Returns a list of grading events, which may be empty if none exist.
@@ -40,7 +36,11 @@ public GradingEvents() {
      * @return
      */
     public List<GradingEvent> getEvents(String studentId) {
-        return studentsToEventsMap.get(studentId);
+        List<GradingEvent> list = studentsToEventsMap.get(studentId);
+        if (list == null) {
+            list = new ArrayList<>();
+        }
+        return list;
     }
 
     public void addEvent(GradingEvent event) {