github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

compilation error fix.

Browse source
This commit is contained in:
magenoxx 2012-01-26 01:59:53 +04:00
parent 6defeeed1f
commit e50de69420
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Common/src/mage/remote/Session.java
View file

@ -202,7 +202,11 @@ public class Session {
private void runEmbeddedMageServer() { private void runEmbeddedMageServer() {
if (embeddedMageServerAction != null) { if (embeddedMageServerAction != null) {
embeddedMageServerAction.execute(); try {
embeddedMageServerAction.execute();
} catch (MageException e) {
logger.error(e);
}
} }
} }

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

@ -746,6 +746,8 @@ public class MageServerImpl implements MageServer {
} catch (MageException me) { } catch (MageException me) {
throw new RuntimeException(me); throw new RuntimeException(me);
} }
} else {
LogServiceImpl.instance.log(LogKeys.KEY_NOT_VALID_SESSION_INTERNAL, actionName, sessionId);
} }
} }
} }
@ -769,6 +771,7 @@ public class MageServerImpl implements MageServer {
return executeWithResult(actionName, sessionId, action); return executeWithResult(actionName, sessionId, action);
} }
//TODO: also run in threads with future task
protected <T> T executeWithResult(String actionName, final String sessionId, final ActionWithResult<T> action) throws MageException { protected <T> T executeWithResult(String actionName, final String sessionId, final ActionWithResult<T> action) throws MageException {
if (SessionManager.getInstance().isValidSession(sessionId)) { if (SessionManager.getInstance().isValidSession(sessionId)) {
try { try {