From 4b897742063fbf41ef8848061f829ee3bdce12d3 Mon Sep 17 00:00:00 2001
From: "heavyrain.lee" <heavyrain.lee@gmail.com>
Date: Mon, 2 Mar 2020 16:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A5=E6=94=B6=E5=A5=BD?=
 =?UTF-8?q?=E5=8F=8B=E8=AF=B7=E6=B1=82=E5=BC=82=E5=B8=B8=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moquette/imhandler/HandleFriendRequestHandler.java   | 9 ++++++---
 .../java/io/moquette/persistence/MemorySessionStore.java | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
index 54b0bc1a..0e4a8bd8 100644
--- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
@@ -37,8 +37,11 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                 saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
                 MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
-
-                WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent(I18n.getString(session.getLanguage(), "Above_Greeting_Message"));
+                String language = "zh_CN";
+                if (session != null) {
+                    language = session.getLanguage();
+                }
+                WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
                 
                 builder = WFCMessage.Message.newBuilder();
                 builder.setFromUser(request.getTargetUid());
@@ -51,7 +54,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                 builder.setMessageId(messageId);
                 saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
-                contentBuilder.setContent(I18n.getString(session.getLanguage(), "Friend_Can_Start_Chat"));
+                contentBuilder.setContent(I18n.getString(language, "Friend_Can_Start_Chat"));
                 builder.setContent(contentBuilder);
                 messageId = MessageShardingUtil.generateId();
                 builder.setMessageId(messageId);
diff --git a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
index 080d189c..f7bb3359 100755
--- a/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
@@ -279,6 +279,9 @@ public class MemorySessionStore implements ISessionsStore {
 
     @Override
     public Session getSession(String clientID) {
+        if (StringUtil.isNullOrEmpty(clientID)) {
+            return null;
+        }
         Session session = sessions.get(clientID);
         if (session == null) {
             LOG.error("Can't find the session for client <{}>", clientID);