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

* Cleanup of server memory handling - removed memory leaks for Chat, Player, Match, Game etc.

Browse source
This commit is contained in:
LevelX2 2014-02-21 01:13:27 +01:00
parent c7289a3810
commit 8491b5b90b
27 changed files with 255 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Server/src/main/java/mage/server/game/GameManager.java
View file

@ -48,7 +48,7 @@ public class GameManager {
private GameManager() {}
private ConcurrentHashMap<UUID, GameController> gameControllers = new ConcurrentHashMap<UUID, GameController>();
private final ConcurrentHashMap<UUID, GameController> gameControllers = new ConcurrentHashMap<>();
public UUID createGameSession(Game game, ConcurrentHashMap<UUID, UUID> userPlayerMap, UUID tableId, UUID choosingPlayerId) {
GameController gameController = new GameController(game, userPlayerMap, tableId, choosingPlayerId);
@ -62,9 +62,9 @@ public class GameManager {
}
}
public void destroyChatSession(UUID gameId) {
gameControllers.remove(gameId);
}
// public void destroyChatSession(UUID gameId) {
// gameControllers.remove(gameId);
// }
public UUID getChatId(UUID gameId) {
if (gameControllers.containsKey(gameId)) {
@ -145,11 +145,11 @@ public class GameManager {
}
}
public void removeSession(UUID userId) {
for (GameController controller: gameControllers.values()) {
controller.kill(userId);
}
}
// public void removeSession(UUID userId) {
// for (GameController controller: gameControllers.values()) {
// controller.kill(userId);
// }
// }
public void kill(UUID gameId, UUID userId) {
if (gameControllers.containsKey(gameId)) {
@ -177,7 +177,11 @@ public class GameManager {
}
public void removeGame(UUID gameId) {
gameControllers.remove(gameId);
GameController gameController = gameControllers.get(gameId);
if (gameController != null) {
gameController.cleanUp();
gameControllers.remove(gameId);
}
}
public boolean saveGame(UUID gameId) {