From e49a36fd49878c85ffadc6fd1672ec9504f4c769 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Sun, 22 Jul 2018 23:17:05 +0200
Subject: [PATCH] Initialize ContentGroups for Room
---
src/main/java/de/thm/arsnova/entities/Room.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/entities/Room.java b/src/main/java/de/thm/arsnova/entities/Room.java
index c28276601..dfb4baf81 100644
--- a/src/main/java/de/thm/arsnova/entities/Room.java
+++ b/src/main/java/de/thm/arsnova/entities/Room.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonView;
import de.thm.arsnova.entities.serialization.View;
import org.springframework.core.style.ToStringCreator;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -367,6 +368,10 @@ public class Room extends Entity {
@JsonView({View.Persistence.class, View.Public.class})
public Map<String, ContentGroup> getContentGroups() {
+ if (contentGroups == null) {
+ contentGroups = new HashMap<>();
+ }
+
return contentGroups;
}
--
GitLab