[java-identity-provider COMMIT] /trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Dec 30 19:13:09 2013
New Revision: 5112

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5112&view=rev
Log:
The ReloadableSpringService needs to implement the Spring ApplicationContextAware interface to set the parent context, cleanup from IDP-330, IDP-329.

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java?rev=5112&r1=5111&r2=5112&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java Mon Dec 30 19:13:09 2013
@@ -32,6 +32,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.Resource;
 
@@ -45,7 +46,7 @@
  * @param <T> The precise service being implemented.
  */
 @ThreadSafe
-public class ReloadableSpringService<T> extends AbstractReloadableService {
+public class ReloadableSpringService<T> extends AbstractReloadableService implements ApplicationContextAware {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(ReloadableSpringService.class);
@@ -304,4 +305,8 @@
         return cachedComponent;
     }
 
+    /** {@inheritDoc} */
+    public void setApplicationContext(ApplicationContext applicationContext) {
+        setParentContext(applicationContext);
+    }
 }