github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed possible NPE between callbacks (as client and server are not synchronized between calls)

Browse source
This commit is contained in:
magenoxx 2011-06-22 20:35:16 +04:00
parent 2977afea2d
commit c7ae032d5a
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Common/src/mage/interfaces/callback/CallbackClientDaemon.java
View file

@ -64,7 +64,9 @@ public class CallbackClientDaemon extends Thread {
@Override
public void run() {
try {
client.processCallback(callback);
if (callback != null) {
client.processCallback(callback);
}
}
catch (Exception ex) {
logger.fatal("CallbackClientDaemon error ", ex);

6
Mage.Server/src/main/java/mage/server/ServerImpl.java
View file

@ -101,7 +101,11 @@ public class ServerImpl extends RemoteServer implements Server {
@Override
public ClientCallback callback(UUID sessionId) {
return SessionManager.getInstance().getSession(sessionId).callback();
Session session = SessionManager.getInstance().getSession(sessionId);
if (session == null) {
return null;
}
return session.callback();
}
@Override