From 44d0df6bde2ab1726b90d30bd7848f997ba2b826 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 30 Apr 2013 17:10:35 +0200 Subject: [PATCH] Small changes to user/chat/session handling (not finished yet). --- Mage.Server/src/main/java/mage/server/ChatSession.java | 6 +++--- Mage.Server/src/main/java/mage/server/User.java | 2 +- Mage.Server/src/main/java/mage/server/UserManager.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/ChatSession.java b/Mage.Server/src/main/java/mage/server/ChatSession.java index bcaafbca169..67178d1944d 100644 --- a/Mage.Server/src/main/java/mage/server/ChatSession.java +++ b/Mage.Server/src/main/java/mage/server/ChatSession.java @@ -71,10 +71,10 @@ public class ChatSession { clients.remove(userId); switch (reason) { case Disconnected: - message = " has quit MAGE"; + message = " has left MAGE"; break; - case SessionExpired: - message = " session expired"; + case LostConnection: + message = " has lost connection"; break; default: message = " has left chat"; diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java index 5aa2003ea42..4b9f998477c 100644 --- a/Mage.Server/src/main/java/mage/server/User.java +++ b/Mage.Server/src/main/java/mage/server/User.java @@ -57,7 +57,7 @@ public class User { } public enum DisconnectReason { - SessionExpired, Disconnected, CleaningUp; + LostConnection, Disconnected, CleaningUp; } private UUID userId = UUID.randomUUID(); diff --git a/Mage.Server/src/main/java/mage/server/UserManager.java b/Mage.Server/src/main/java/mage/server/UserManager.java index 4855c35a990..e1e70e80066 100644 --- a/Mage.Server/src/main/java/mage/server/UserManager.java +++ b/Mage.Server/src/main/java/mage/server/UserManager.java @@ -142,7 +142,7 @@ public class UserManager { for (User user: users.values()) { if (user.isExpired(expired.getTime())) { logger.info(user.getName() + " session expired " + user.getId()); - user.kill(User.DisconnectReason.SessionExpired); + user.kill(User.DisconnectReason.LostConnection); users.remove(user.getId()); } }