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

changed "already connected" state handling

Browse source
This commit is contained in:
magenoxx 2012-04-28 03:00:11 +04:00
parent b43492ba19
commit d10385fad2
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,6 +267,7 @@ public class Session {
class CallbackHandler implements InvokerCallbackHandler { class CallbackHandler implements InvokerCallbackHandler {
@Override @Override
public void handleCallback(Callback callback) throws HandleCallbackException { public void handleCallback(Callback callback) throws HandleCallbackException {
logger.info("callback handler");
client.processCallback((ClientCallback)callback.getCallbackObject()); client.processCallback((ClientCallback)callback.getCallbackObject());
} }
} }

8
Mage.Server/src/main/java/mage/server/Session.java
View file

@ -75,8 +75,12 @@ public class Session {
if (user.getHost().equals(host)) { if (user.getHost().equals(host)) {
if (user.getSessionId().isEmpty()) if (user.getSessionId().isEmpty())
logger.info("Reconnecting session for " + userName); logger.info("Reconnecting session for " + userName);
else else {
throw new MageException("This machine is already connected"); //throw new MageException("This machine is already connected");
//disconnect previous one
logger.info("Disconnecting another user instance: " + userName);
UserManager.getInstance().disconnect(user.getId());
}
} }
else { else {
throw new MageException("User name already in use"); throw new MageException("User name already in use");