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:23 UTC
[1/2] openmeetings git commit: [OPENMEETINGS-1677] NullStringer is
used for message serialization
Repository: openmeetings
Updated Branches:
refs/heads/master 1e298f779 -> fa2a81eb9
[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/9b8e1205
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9b8e1205
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9b8e1205
Branch: refs/heads/master
Commit: 9b8e1205c201f3ff96856318b18105f2a0edae76
Parents: 1e298f7
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:04 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/9b8e1205/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/9b8e1205/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() {
[2/2] openmeetings git commit: [OPENMEETINGS-1677] NullStringer is
used for message serialization
Posted by so...@apache.org.
[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;
}