You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/02 03:41:24 UTC
[2/2] openmeetings git commit: [OPENMEETINGS-1677] NullStringer is
used for message serialization
[OPENMEETINGS-1677] NullStringer is used for message serialization
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fa2a81eb
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fa2a81eb
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fa2a81eb
Branch: refs/heads/master
Commit: fa2a81eb92e1bd116ae81840f05874f811a764cf
Parents: 9b8e120
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Aug 2 10:41:15 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Aug 2 10:41:15 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/room/wb/WsMessageWb.java | 3 ++-
.../java/org/apache/openmeetings/web/room/wb/WsMessageWbFile.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa2a81eb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWb.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWb.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWb.java
index 81bc775..6c8018e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWb.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWb.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.room.wb;
+import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.ws.IClusterWsMessage;
import com.github.openjson.JSONObject;
@@ -32,7 +33,7 @@ public class WsMessageWb implements IClusterWsMessage {
public WsMessageWb(Long roomId, WbAction meth, JSONObject obj, String uid) {
this.roomId = roomId;
this.meth = meth;
- this.obj = obj.toString();
+ this.obj = obj.toString(new NullStringer());
this.uid = uid;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fa2a81eb/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWbFile.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWbFile.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWbFile.java
index d8fc370..d0e9ff3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWbFile.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WsMessageWbFile.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.room.wb;
import org.apache.openmeetings.db.entity.file.FileItem;
+import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.ws.IClusterWsMessage;
import com.github.openjson.JSONObject;
@@ -35,7 +36,7 @@ public class WsMessageWbFile implements IClusterWsMessage {
this.roomId = roomId;
this.wbId = wbId;
this.ruid = ruid;
- this.file = file.toString();
+ this.file = file.toString(new NullStringer());
this.fi = fi;
}