From f08122680cecbf0bd0a4ec3dc5517b31a7f6f385 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 25 Dec 2011 17:10:58 +0000 Subject: [PATCH] Fixed the whole waiting for collection thing. --- .../com/gempukku/lotro/ServerManagement.java | 1 - .../collection/CollectionSerializer.java | 1 - .../lotro/game/DefaultCardCollection.java | 21 ------------------- .../com/gempukku/lotro/game/LotroServer.java | 12 +++++++++-- .../gempukku/lotro/league/LeagueService.java | 1 - .../collection/CollectionSerializerTest.java | 2 -- .../gempukku/lotro/server/AdminResource.java | 1 - 7 files changed, 10 insertions(+), 29 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/ServerManagement.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/ServerManagement.java index 4194fb45c..3c205318a 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/ServerManagement.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/ServerManagement.java @@ -25,7 +25,6 @@ public class ServerManagement { LeagueDAO leagueDao = new LeagueDAO(dbAccess); DefaultCardCollection collection = new DefaultCardCollection(); collection.addPacks("FotR - League Starter", 1); - collection.finishedReading(); leagueDao.addLeague("Test league", "league_test", collection, 20111122, 20121123); } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java index 871bca8a9..a40b5a90b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java @@ -127,7 +127,6 @@ public class CollectionSerializer { final String blueprintId = _cardIds.get(i); collection.addCards(blueprintId, cards[i]); } - collection.finishedReading(); return collection; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java index 0ed44b388..1e8fe76f4 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java @@ -6,17 +6,10 @@ import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.packs.PacksStorage; import java.util.*; -import java.util.concurrent.CountDownLatch; public class DefaultCardCollection implements MutableCardCollection { private Map _counts = new HashMap(); - private CountDownLatch _collectionReadyLatch = new CountDownLatch(1); - - public void finishedReading() { - _collectionReadyLatch.countDown(); - } - private static class NameComparator implements Comparator { private LotroCardBlueprintLibrary _library; @@ -187,14 +180,6 @@ public class DefaultCardCollection implements MutableCardCollection { return null; } - public void waitTillLoaded() { - try { - _collectionReadyLatch.await(); - } catch (InterruptedException exp) { - throw new RuntimeException(exp); - } - } - @Override public Map getAll() { return Collections.unmodifiableMap(_counts); @@ -202,12 +187,6 @@ public class DefaultCardCollection implements MutableCardCollection { @Override public List getItems(String filter, LotroCardBlueprintLibrary library) { - try { - _collectionReadyLatch.await(); - } catch (InterruptedException exp) { - throw new RuntimeException(exp); - } - if (filter == null) filter = ""; String[] filterParams = filter.split(" "); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java index f483164b0..f103ef89e 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; public class LotroServer extends AbstractServer { private static final Logger log = Logger.getLogger(LotroServer.class); @@ -31,7 +32,10 @@ public class LotroServer extends AbstractServer { private DeckDAO _deckDao; private GameHistoryDAO _gameHistoryDao; + private DefaultCardCollection _defaultCollection; + private CountDownLatch _collectionReadyLatch = new CountDownLatch(1); + private ChatServer _chatServer; private boolean _test; private GameRecorder _gameRecorder; @@ -64,7 +68,7 @@ public class LotroServer extends AbstractServer { } } } - _defaultCollection.finishedReading(); + _collectionReadyLatch.countDown(); } } ); @@ -78,7 +82,11 @@ public class LotroServer extends AbstractServer { } public CardCollection getDefaultCollection() { - _defaultCollection.waitTillLoaded(); + try { + _collectionReadyLatch.await(); + } catch (InterruptedException exp) { + throw new RuntimeException("Error while awaiting loading a default colleciton", exp); + } return _defaultCollection; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java index 94ae00cce..14b60e2d4 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java @@ -42,7 +42,6 @@ public class LeagueService { else collection.addPacks(item.getBlueprintId(), item.getCount()); } - collection.finishedReading(); return collection; } return collectionForPlayer; diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java index f09b4d5d4..65eb9acb9 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/collection/CollectionSerializerTest.java @@ -22,7 +22,6 @@ public class CollectionSerializerTest { collection.addCards("1_23*", 3); collection.addCards("1_237T*", 3); collection.addPacks("FotR - Booster", 2); - collection.finishedReading(); CollectionSerializer serializer = new CollectionSerializer(); @@ -48,7 +47,6 @@ public class CollectionSerializerTest { DefaultCardCollection collection = new DefaultCardCollection(); collection.addPacks("FotR - Booster", 8); - collection.finishedReading(); CollectionSerializer serializer = new CollectionSerializer(); diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java index 6ec14102e..0f7bdca9f 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java +++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java @@ -73,7 +73,6 @@ public class AdminResource extends AbstractResource { List packs = getItems(packCollection); for (String pack : packs) collection.addPacks(pack, 1); - collection.finishedReading(); _leagueDao.addLeague(name, type, collection, start, end);