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:55 UTC
openmeetings git commit: [OPENMEETINGS-1677] NullStringer is used for
message serialization
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 33845de4d -> 4264f8b0f
[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/4264f8b0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4264f8b0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4264f8b0
Branch: refs/heads/3.3.x
Commit: 4264f8b0f4ac6c40b0a8ef30951b14ecd9174d77
Parents: 33845de
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Aug 2 10:41:04 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Aug 2 10:41:48 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/core/util/ws/WsMessageChat.java | 3 ++-
.../java/org/apache/openmeetings/core/util/ws/WsMessageRoom.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4264f8b0/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageChat.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageChat.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageChat.java
index debd5b4..8fecd10 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageChat.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageChat.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.core.util.ws;
import org.apache.openmeetings.db.entity.basic.ChatMessage;
+import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.ws.IClusterWsMessage;
import com.github.openjson.JSONObject;
@@ -30,7 +31,7 @@ public class WsMessageChat implements IClusterWsMessage {
public WsMessageChat(ChatMessage m, JSONObject msg) {
this.m = m;
- this.msg = msg.toString();
+ this.msg = msg.toString(new NullStringer());
}
public ChatMessage getChatMessage() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4264f8b0/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageRoom.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageRoom.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageRoom.java
index d947eb8..2483f7a 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageRoom.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ws/WsMessageRoom.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.core.util.ws;
+import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.ws.IClusterWsMessage;
import com.github.openjson.JSONObject;
@@ -29,7 +30,7 @@ public class WsMessageRoom implements IClusterWsMessage {
public WsMessageRoom(Long roomId, JSONObject msg) {
this.roomId = roomId;
- this.msg = msg.toString();
+ this.msg = msg.toString(new NullStringer());
}
public Long getRoomId() {