diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java index 3b50d0469..71097d47e 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java @@ -28,7 +28,7 @@ public class ChatRoomMediator { } public List joinUser(String playerId) { - _lock.writeLock(); + _lock.writeLock().lock(); try { GatheringChatRoomListener value = new GatheringChatRoomListener(); _listeners.put(playerId, value); diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/CardLibraryProvider.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/CardLibraryProvider.java deleted file mode 100644 index 7e108e058..000000000 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/CardLibraryProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gempukku.lotro.server.provider; - -import com.gempukku.lotro.game.LotroCardBlueprintLibrary; -import com.sun.jersey.core.spi.component.ComponentContext; -import com.sun.jersey.core.spi.component.ComponentScope; -import com.sun.jersey.spi.inject.Injectable; -import com.sun.jersey.spi.inject.InjectableProvider; - -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; -import java.lang.reflect.Type; - -@Provider -public class CardLibraryProvider implements InjectableProvider, Injectable { - private LotroCardBlueprintLibrary _library; - - public CardLibraryProvider() { - _library = new LotroCardBlueprintLibrary(); - } - - @Override - public ComponentScope getScope() { - return ComponentScope.Singleton; - } - - @Override - public LotroCardBlueprintLibrary getValue() { - return _library; - } - - @Override - public Injectable getInjectable(ComponentContext ic, Context context, Type type) { - if (type.equals(LotroCardBlueprintLibrary.class)) - return this; - return null; - } -} diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java index 2c68f2768..a227444d1 100644 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java +++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/provider/DaoProvider.java @@ -34,8 +34,7 @@ public class DaoProvider implements InjectableProvider { private DbAccess _dbAccess; private CollectionSerializer _collectionSerializer; - @Context - private LotroCardBlueprintLibrary _library; + private LotroCardBlueprintLibrary _library = new LotroCardBlueprintLibrary(); public DaoProvider() { _dbAccess = new DbAccess();