Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

added Default annotation to fix ServletContext injection on eager loading singletons

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-08-24 14:49:35 +02:00
parent 9d1480acee
commit 50b0b6b2b8
9 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java
View File

@@ -53,6 +53,7 @@ import java.util.Map;
import java.util.Set;
import javax.servlet.ServletContext;
import sonia.scm.Default;
/**
*
@@ -79,7 +80,7 @@ public class DefaultResourceManager extends AbstractResourceManager
* @param resourceHandlers
*/
@Inject
public DefaultResourceManager(ServletContext servletContext,
public DefaultResourceManager(@Default ServletContext servletContext,
PluginLoader pluginLoader, Set<ResourceHandler> resourceHandlers)
{
super(servletContext, pluginLoader, resourceHandlers);

3
scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
View File

@@ -38,6 +38,7 @@ package sonia.scm.resources;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import sonia.scm.Default;
import sonia.scm.plugin.PluginLoader;
//~--- JDK imports ------------------------------------------------------------
@@ -72,7 +73,7 @@ public class DevelopmentResourceManager extends AbstractResourceManager
* @param resourceHandlers
*/
@Inject
public DevelopmentResourceManager(ServletContext servletContext,
public DevelopmentResourceManager(@Default ServletContext servletContext,
PluginLoader pluginLoader, Set<ResourceHandler> resourceHandlers)
{
super(servletContext, pluginLoader, resourceHandlers);