ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Giving direct access to HallCommunicationChannel.

Browse Source
This commit is contained in:
marcins78
2013-01-18 15:56:52 +00:00
parent afd9cd2353
commit d97ef2aa44
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java
View File

@@ -445,7 +445,7 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
@Override @Override
public boolean isChanged() { public boolean isChanged() {
try { try {
return _hallServer.hasChanges(_resourceOwner, _channelNumber); return _hallServer.getCommunicationChannel(_resourceOwner, _channelNumber).hasChangesInCommunicationChannel(_hallServer, _resourceOwner);
} catch (SubscriptionExpiredException e) { } catch (SubscriptionExpiredException e) {
return true; return true;
} catch (SubscriptionConflictException e) { } catch (SubscriptionConflictException e) {
@@ -463,7 +463,7 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri
Element hall = doc.createElement("hall"); Element hall = doc.createElement("hall");
try { try {
_hallServer.processHall(_resourceOwner, _channelNumber, new SerializeHallInfoVisitor(doc, hall)); _hallServer.getCommunicationChannel(_resourceOwner, _channelNumber).processCommunicationChannel(_hallServer, _resourceOwner, new SerializeHallInfoVisitor(doc, hall));
} catch (SubscriptionExpiredException exp) { } catch (SubscriptionExpiredException exp) {
throw new HttpProcessingException(410); throw new HttpProcessingException(410);
} catch (SubscriptionConflictException exp) { } catch (SubscriptionConflictException exp) {

22
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -432,31 +432,13 @@ public class HallServer extends AbstractServer {
} }
} }
public boolean hasChanges(Player player, int channelNumber) throws SubscriptionExpiredException, SubscriptionConflictException { public HallCommunicationChannel getCommunicationChannel(Player player, int channelNumber) throws SubscriptionExpiredException, SubscriptionConflictException {
_hallDataAccessLock.readLock().lock(); _hallDataAccessLock.readLock().lock();
try { try {
HallCommunicationChannel communicationChannel = _playerChannelCommunication.get(player); HallCommunicationChannel communicationChannel = _playerChannelCommunication.get(player);
if (communicationChannel != null) { if (communicationChannel != null) {
if (communicationChannel.getChannelNumber() == channelNumber) { if (communicationChannel.getChannelNumber() == channelNumber) {
return communicationChannel.hasChangesInCommunicationChannel(this, player); return communicationChannel;
} else {
throw new SubscriptionConflictException();
}
} else {
throw new SubscriptionExpiredException();
}
} finally {
_hallDataAccessLock.readLock().unlock();
}
}
public void processHall(Player player, int channelNumber, HallChannelVisitor hallChannelVisitor) throws SubscriptionExpiredException, SubscriptionConflictException {
_hallDataAccessLock.readLock().lock();
try {
HallCommunicationChannel communicationChannel = _playerChannelCommunication.get(player);
if (communicationChannel != null) {
if (communicationChannel.getChannelNumber() == channelNumber) {
communicationChannel.processCommunicationChannel(this, player, hallChannelVisitor);
} else { } else {
throw new SubscriptionConflictException(); throw new SubscriptionConflictException();
} }