update

wildfirechat · Sep 2, 2019 · 4b7804c · 4b7804c
1 parent d075b52
commit 4b7804c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
@@ -1265,7 +1265,6 @@ void updateGroupMemberCountDt(final String groupId, final int count, final long
     }
 
     void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList) {
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
             try {
@@ -1321,7 +1320,6 @@ void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember>
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
 
     int removeGroupMember(String groupId, List<String> groupMembers) {

diff --git a/common/src/main/java/cn.wildfirechat.pojos/InputCreateChannel.java b/common/src/main/java/cn.wildfirechat.pojos/InputCreateChannel.java
@@ -27,18 +27,29 @@ public class InputCreateChannel {
     private long updateDt;
 
     public WFCMessage.ChannelInfo toProtoChannelInfo() {
-        return WFCMessage.ChannelInfo.newBuilder().setOwner(owner)
-            .setName(name)
-            .setTargetId(targetId)
-            .setCallback(callback)
-            .setPortrait(portrait)
-            .setAutomatic(auto)
-            .setSecret(secret)
-            .setDesc(desc)
-            .setStatus(status)
-            .setExtra(extra)
-            .setUpdateDt(updateDt)
-            .build();
+        WFCMessage.ChannelInfo.Builder builder = WFCMessage.ChannelInfo.newBuilder().setOwner(owner);
+        if (!StringUtil.isNullOrEmpty(name))
+            builder = builder.setName(name);
+        if (!StringUtil.isNullOrEmpty(targetId))
+            builder = builder.setTargetId(targetId);
+        if (!StringUtil.isNullOrEmpty(callback))
+            builder = builder.setCallback(callback);
+        if (!StringUtil.isNullOrEmpty(portrait))
+            builder = builder.setPortrait(portrait);
+        builder = builder.setAutomatic(auto);
+        if (!StringUtil.isNullOrEmpty(secret))
+            builder = builder.setSecret(secret);
+        if (!StringUtil.isNullOrEmpty(desc))
+            builder = builder.setDesc(desc);
+        builder = builder.setStatus(status);
+        if (!StringUtil.isNullOrEmpty(extra))
+            builder = builder.setExtra(extra);
+        if (!StringUtil.isNullOrEmpty(name))
+            builder = builder.setUpdateDt(updateDt);
+        else
+            builder = builder.setUpdateDt(System.currentTimeMillis());
+
+        return builder.build();
     }
 
     public String getOwner() {