Repository: openmeetings Updated Branches: refs/heads/master 66ca69884 -> 987ca57cf
[OPENMEETINGS-1751] direct document load should be fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/987ca57c Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/987ca57c Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/987ca57c Branch: refs/heads/master Commit: 987ca57cf48544990975ffcaa64e8afd2e812bc4 Parents: 66ca698 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Fri Nov 10 11:32:54 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Fri Nov 10 11:33:18 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/987ca57c/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java index 6b80349..82bfe31 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java @@ -118,7 +118,8 @@ public class Whiteboard implements Serializable { } public JSONObject get(String uid) { - return new JSONObject(roomItems.get(uid)); + String obj = roomItems.get(uid); + return obj == null ? null : new JSONObject(obj); } public boolean contains(String uid) {
