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

* Session locking - Fixed some problems with the reentrant lock.

Browse source
This commit is contained in:
LevelX2 2014-12-01 17:00:26 +01:00
parent 2af52cfd3a
commit 896793b93d
4 changed files with 92 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage.Server/src/main/java/mage/server/User.java
View file

@ -29,6 +29,7 @@ package mage.server;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@ -123,14 +124,25 @@ public class User {
this.sessionId = sessionId;
if (sessionId.isEmpty()) {
userState = UserState.Disconnected;
logger.debug("Disconnected User " + userName + " id: " + userId);
lostConnection();
logger.debug("USER - lost connection: " + userName + " id: " + userId);
} else if (userState == UserState.Created) {
userState = UserState.Connected;
logger.debug("Created user " + userName + " id: " + userId);
logger.debug("USER - created: " + userName + " id: " + userId);
} else {
userState = UserState.Reconnected;
reconnect();
logger.info("Reconnected user " + userName + " id: " + userId);
logger.info("USER - reconnected: " + userName + " id: " + userId);
}
}
public void lostConnection() {
// Because watched games don't get restored after reconnection call stop watching
for (Iterator<UUID> iterator = watchedGames.iterator(); iterator.hasNext();) {
UUID gameId = iterator.next();
GameManager.getInstance().stopWatching(gameId, userId);
iterator.remove();
}
}