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

Added synchronization in client session - fixes NPE on exit.

Browse source
This commit is contained in:
magenoxx 2011-06-15 23:11:05 +04:00
parent 44b48a3722
commit bbb9e575eb
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Mage.Client/src/main/java/mage/client/remote/Session.java
View file

@ -43,6 +43,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.swing.JOptionPane;
import mage.cards.decks.DeckCardLists;
import mage.client.MageFrame;
@ -90,6 +91,15 @@ public class Session {
private ScheduledFuture<?> future;
private MageUI ui = new MageUI();
/**
* For locking session object.
* Read-write locking is used for better performance, as in most cases session object won't be changed so
* there shouldn't be any penalty for synchronization.
*
* @author nantuko
*/
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
public Session(MageFrame frame) {
this.frame = frame;
}
@ -174,7 +184,12 @@ public class Session {
private void removeServer() {
if (future != null && !future.isDone())
future.cancel(true);
server = null;
lock.writeLock().lock();
try {
server = null;
} finally {
lock.writeLock().unlock();
}
frame.hideGames();
frame.hideTables();
frame.setStatusText("Not connected");
@ -348,7 +363,9 @@ public class Session {
}
public Collection<TableView> getTables(UUID roomId) throws MageRemoteException {
lock.readLock().lock();
try {
if (server == null) return null;
return server.getTables(roomId);
} catch (RemoteException ex) {
handleRemoteException(ex);
@ -356,10 +373,13 @@ public class Session {
} catch (MageException ex) {
handleMageException(ex);
throw new MageRemoteException();
} finally {
lock.readLock().unlock();
}
}
public Collection<String> getConnectedPlayers(UUID roomId) throws MageRemoteException {
lock.readLock().lock();
try {
return server.getConnectedPlayers(roomId);
} catch (RemoteException ex) {
@ -368,6 +388,8 @@ public class Session {
} catch (MageException ex) {
handleMageException(ex);
throw new MageRemoteException();
} finally {
lock.readLock().unlock();
}
}
@ -467,7 +489,9 @@ public class Session {
}
public boolean leaveChat(UUID chatId) {
lock.readLock().lock();
try {
if (server == null) return false;
server.leaveChat(chatId, sessionId);
chats.remove(chatId);
return true;
@ -475,18 +499,24 @@ public class Session {
handleRemoteException(ex);
} catch (MageException ex) {
handleMageException(ex);
} finally {
lock.readLock().unlock();
}
return false;
}
public boolean sendChatMessage(UUID chatId, String message) {
lock.readLock().lock();
try {
if (server == null) return false;
server.sendChatMessage(chatId, userName, message);
return true;
} catch (RemoteException ex) {
handleRemoteException(ex);
} catch (MageException ex) {
handleMageException(ex);
} finally {
lock.readLock().unlock();
}
return false;
}

3
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -490,7 +490,8 @@ class UpdateTablesTask extends SwingWorker<Void, Collection<TableView>> {
@Override
protected Void doInBackground() throws Exception {
while (!isCancelled()) {
this.publish(session.getTables(roomId));
Collection<TableView> tables = session.getTables(roomId);
if (tables != null) this.publish(tables);
Thread.sleep(1000);
}
return null;