killbill-aplcache

server: fix injection in KillbillGuiceFilter Signed-off-by:

3/13/2014 5:16:40 PM

Details

diff --git a/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java b/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java
index 5814344..8796a52 100644
--- a/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java
+++ b/server/src/main/java/org/killbill/billing/server/filters/KillbillGuiceFilter.java
@@ -16,7 +16,6 @@
 
 package org.killbill.billing.server.filters;
 
-import javax.inject.Inject;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 
@@ -25,15 +24,13 @@ import org.skife.config.ConfigSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.inject.Injector;
 import com.google.inject.servlet.GuiceFilter;
 
 public class KillbillGuiceFilter extends GuiceFilter {
 
     private static final Logger log = LoggerFactory.getLogger(KillbillGuiceFilter.class);
 
-    @Inject
-    private ConfigSource configSource;
-
     @Override
     public void init(final FilterConfig filterConfig) throws ServletException {
         super.init(filterConfig);
@@ -41,6 +38,9 @@ public class KillbillGuiceFilter extends GuiceFilter {
         // At this point, Kill Bill server is fully initialized
         log.info("Kill Bill server has started");
 
+        // The magic happens in KillbillGuiceListener
+        final Injector injector = (Injector) filterConfig.getServletContext().getAttribute(Injector.class.getName());
+        final ConfigSource configSource = injector.getInstance(ConfigSource.class);
         final UpdateChecker checker = new UpdateChecker(configSource);
         checker.check(filterConfig.getServletContext());
     }