From b64e1658e998918c50ea1c1df6040c76829aa1b7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 24 Sep 2012 07:36:05 +0200 Subject: [PATCH] Prevent some exceptions if sesssion is session is expired --- .../main/java/mage/server/MageServerImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/MageServerImpl.java b/Mage.Server/src/main/java/mage/server/MageServerImpl.java index dac970eda50..be9e61ece94 100644 --- a/Mage.Server/src/main/java/mage/server/MageServerImpl.java +++ b/Mage.Server/src/main/java/mage/server/MageServerImpl.java @@ -469,7 +469,11 @@ public class MageServerImpl implements MageServer { execute("sendPlayerUUID", sessionId, new Action() { public void execute() { User user = SessionManager.getInstance().getUser(sessionId); - user.sendPlayerUUID(gameId, data); + if (user != null) { + user.sendPlayerUUID(gameId, data); + } else { + logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId); + } } }); } @@ -479,7 +483,11 @@ public class MageServerImpl implements MageServer { execute("sendPlayerString", sessionId, new Action() { public void execute() { User user = SessionManager.getInstance().getUser(sessionId); - user.sendPlayerString(gameId, data); + if (user != null) { + user.sendPlayerString(gameId, data); + } else { + logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId); + } } }); } @@ -489,7 +497,11 @@ public class MageServerImpl implements MageServer { execute("sendPlayerBoolean", sessionId, new Action() { public void execute() { User user = SessionManager.getInstance().getUser(sessionId); - user.sendPlayerBoolean(gameId, data); + if (user != null) { + user.sendPlayerBoolean(gameId, data); + } else { + logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId); + } } }); }