From ca39289a3aa1afda3c4ed504fb98079baee9ec4a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 29 Sep 2016 16:20:29 +0200 Subject: [PATCH] Fixed a possible null pointer exception. --- Mage.Server/src/main/java/mage/server/MageServerImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/MageServerImpl.java b/Mage.Server/src/main/java/mage/server/MageServerImpl.java index 680abbedd1b..85a968b099c 100644 --- a/Mage.Server/src/main/java/mage/server/MageServerImpl.java +++ b/Mage.Server/src/main/java/mage/server/MageServerImpl.java @@ -558,8 +558,12 @@ public class MageServerImpl implements MageServer { execute("leaveChat", sessionId, new Action() { @Override public void execute() { - UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); - ChatManager.getInstance().leaveChat(chatId, userId); + if (chatId != null) { + UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); + ChatManager.getInstance().leaveChat(chatId, userId); + } else { + logger.warn("The chatId is null. sessionId = " + sessionId); + } } }); }