From 9cd3fe6b8c2cb1dbd00b94f6b8b656cb66a8e8e9 Mon Sep 17 00:00:00 2001
From: "heavyrain.lee" <heavyrain.lee@gmail.com>
Date: Mon, 9 Mar 2020 15:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=A5=BD=E5=8F=8B=E8=AF=B7=E6=B1=82=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/moquette/imhandler/HandleFriendRequestHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
index 0e4a8bd8..be97ecef 100644
--- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
@@ -14,6 +14,7 @@ import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
+import io.netty.util.internal.StringUtil;
 import win.liyufan.im.I18n;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;
@@ -38,7 +39,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
 
                 MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
                 String language = "zh_CN";
-                if (session != null) {
+                if (session != null && !StringUtil.isNullOrEmpty(session.getLanguage())) {
                     language = session.getLanguage();
                 }
                 WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));