From 12e523b37e8d8465c88403054f5f4a9b4722e42c Mon Sep 17 00:00:00 2001 From: "heavyrain.lee" Date: Fri, 5 Jul 2019 17:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=90=8C=E6=AD=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/moquette/imhandler/FriendPullHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java b/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java index c6bbae71..c8d82642 100644 --- a/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java @@ -9,6 +9,7 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.WFCMessage; +import com.hazelcast.util.StringUtil; import com.xiaoleilu.loServer.model.FriendData; import io.moquette.spi.impl.Qos1PublishHandler; import io.netty.buffer.ByteBuf; @@ -25,7 +26,11 @@ public class FriendPullHandler extends IMHandler { WFCMessage.GetFriendsResult.Builder builder = WFCMessage.GetFriendsResult.newBuilder(); for (FriendData data : friendDatas ) { - builder.addEntry(WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp()).setAlias(data.getAlias()).build()); + WFCMessage.Friend.Builder builder1 = WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp()); + if (StringUtil.isNullOrEmpty(data.getAlias())) { + builder1.setAlias(data.getAlias()); + } + builder.addEntry(builder1.build()); } byte[] data = builder.build().toByteArray(); ackPayload.ensureWritable(data.length).writeBytes(data);