[utilities COMMIT] in /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory: AbstractComponentAwar...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Dec 17 03:16:57 2014
New Revision: 713

URL: http://svn.shibboleth.net/view/utilities?rev=713&view=rev
Log:
IDP-543 Ensure that all beans created by a factory and custom schemas are destroyed correctly.
IDP-542 By way of a test we do the tear down of all created application contexts for all tests based on AbstractMetadataParser

Added:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java
Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java?rev=713&r1=712&r2=713&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java Wed Dec 17 03:16:57 2014
@@ -23,13 +23,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.core.io.Resource;
 
 /**
  * A factory bean to summon up an {@link EvaluableScript} from either inline data or from a resource.
  */
-public class EvaluableScriptFactoryBean extends AbstractFactoryBean<EvaluableScript> {
+public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBean<EvaluableScript> {
 
     /** log. */
     private final Logger log = LoggerFactory.getLogger(EvaluableScript.class);
@@ -124,7 +123,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override protected EvaluableScript createInstance() throws Exception {
+    @Override protected EvaluableScript doCreateInstance() throws Exception {
 
         if (null == script && null == resource) {
             log.error("{} A script or a resource must be supplied", sourceId);