github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some possible NPE in MageServerImpl (Fixes #342).

Browse source
This commit is contained in:
LevelX2 2013-09-24 11:16:27 +02:00
parent dc5fc69287
commit faafa3f8be
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -219,7 +219,12 @@ public class MageServerImpl implements MageServer {
//FIXME: why no sessionId here???
public List<TableView> getTables(UUID roomId) throws MageException {
try {
return GamesRoomManager.getInstance().getRoom(roomId).getTables();
GamesRoom room = GamesRoomManager.getInstance().getRoom(roomId);
if (room != null) {
return room.getTables();
} else {
return null;
}
}
catch (Exception ex) {
handleException(ex);
@ -231,7 +236,12 @@ public class MageServerImpl implements MageServer {
//FIXME: why no sessionId here???
public List<MatchView> getFinishedMatches(UUID roomId) throws MageException {
try {
return GamesRoomManager.getInstance().getRoom(roomId).getFinished();
GamesRoom room = GamesRoomManager.getInstance().getRoom(roomId);
if (room != null) {
return room.getFinished();
} else {
return null;
}
}
catch (Exception ex) {
handleException(ex);
@ -243,7 +253,12 @@ public class MageServerImpl implements MageServer {
//FIXME: why no sessionId here???
public List<String> getConnectedPlayers(UUID roomId) throws MageException {
try {
return GamesRoomManager.getInstance().getRoom(roomId).getPlayers();
GamesRoom room = GamesRoomManager.getInstance().getRoom(roomId);
if (room != null) {
return room.getPlayers();
} else {
return null;
}
}
catch (Exception ex) {
handleException(ex);
@ -255,7 +270,12 @@ public class MageServerImpl implements MageServer {
//FIXME: why no sessionId here???
public TableView getTable(UUID roomId, UUID tableId) throws MageException {
try {
return GamesRoomManager.getInstance().getRoom(roomId).getTable(tableId);
GamesRoom room = GamesRoomManager.getInstance().getRoom(roomId);
if (room != null) {
return room.getTable(tableId);
} else {
return null;
}
}
catch (Exception ex) {
handleException(ex);