openmeetings git commit: [OPENMEETINGS-1751] direct document load should be fixed

2017-11-09 Thread solomax
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 
Authored: Fri Nov 10 11:32:54 2017 +0700
Committer: Maxim Solodovnik 
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) {



openmeetings git commit: [OPENMEETINGS-1751] direct document load should be fixed

2017-11-09 Thread solomax
Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x a92011991 -> de39d0114


[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/de39d011
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/de39d011
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/de39d011

Branch: refs/heads/4.0.x
Commit: de39d01140a7c1ce38905f95a258b7a71deab883
Parents: a920119
Author: Maxim Solodovnik 
Authored: Fri Nov 10 11:32:54 2017 +0700
Committer: Maxim Solodovnik 
Committed: Fri Nov 10 11:32:54 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/de39d011/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) {