Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

More changes to user and session handling. Fixes somes issues with client reconnect and connecting other instance.

Browse source
This commit is contained in:
LevelX2 2014-08-29 01:46:53 +02:00
parent 180bae323d
commit df04bf829d
5 changed files with 47 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Mage.Server/src/main/java/mage/server/ChatManager.java
View file

@ -62,10 +62,11 @@ public class ChatManager {
}
public void joinChat(UUID chatId, UUID userId) {
if (chatSessions.containsKey(chatId)) {
chatSessions.get(chatId).join(userId);
ChatSession chatSession = chatSessions.get(chatId);
if (chatSession != null) {
chatSession.join(userId);
} else {
logger.trace("User could not join chatId: " + chatId +" userId: " + userId);
logger.trace("Chat to join not found - chatId: " + chatId +" userId: " + userId);
}
}
@ -77,12 +78,19 @@ public class ChatManager {
}
public void destroyChatSession(UUID chatId) {
if (chatId != null && chatSessions.containsKey(chatId)) {
chatSessions.remove(chatId);
logger.debug("Chat removed - chatId: " + chatId);
} else {
logger.trace("Chat to destroy does not exist - chatId: " + chatId);
}
if (chatId != null) {
ChatSession chatSession = chatSessions.get(chatId);
if (chatSession != null) {
synchronized (chatSession) {
if (chatSessions.containsKey(chatId)) {
chatSessions.remove(chatId);
logger.debug("Chat removed - chatId: " + chatId);
} else {
logger.trace("Chat to destroy does not exist - chatId: " + chatId);
}
}
}
}
}
public void broadcast(UUID chatId, String userName, String message, MessageColor color) {