X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Fspring%2FAbstractSpringArg.java;h=7865241b4093d268a88c8d1dd60f08e53c4597c4;hb=d62a44995fa4bc758ab3b3e6e7ffe7b79c8684ef;hp=86757751bd556d1bd03bb936a5bf04f7198bcdb0;hpb=6e6998e19852f8209f955c0d2c773feca161d4d0;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java
index 86757751b..7865241b4 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java
@@ -7,8 +7,6 @@ import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.context.ApplicationContext;
 
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.DataType;
 
 import org.argeo.slc.ant.SlcProjectHelper;
@@ -19,6 +17,9 @@ public abstract class AbstractSpringArg extends DataType {
 
 	private String bean;
 
+	// cache bean instance to avoid reading it twice if it is a prototype
+	private Object beanInstance = null;
+
 	/** The <u>name</u> of the underlying bean, as set throught the attribute. */
 	public String getBean() {
 		return bean;
@@ -30,28 +31,29 @@ public abstract class AbstractSpringArg extends DataType {
 	}
 
 	/**
-	 * Retrieve the instance of the bean. <b>If teh underlying Spring bean is a
-	 * prototype, it will instanciated each time.</b>
+	 * Retrieve the instance of the bean. <b>The value is cached.</b>
 	 */
-	protected Object getBeanInstance() {
-		Object obj = getContext().getBean(bean);
-
-		BeanWrapper wrapper = new BeanWrapperImpl(obj);
-		for (OverrideArg override : overrides) {
-			wrapper.setPropertyValue(override.getName(), override.getObject());
+	public Object getBeanInstance() {
+		if (beanInstance == null) {
+			beanInstance = getContext().getBean(bean);
+
+			BeanWrapper wrapper = new BeanWrapperImpl(beanInstance);
+			for (OverrideArg override : overrides) {
+				wrapper.setPropertyValue(override.getName(), override
+						.getObject());
+			}
 		}
-
-		return obj;
+		return beanInstance;
 	}
 
-	/** Creates an override subtag.*/
+	/** Creates an override subtag. */
 	public OverrideArg createOverride() {
 		OverrideArg propertyArg = new OverrideArg();
 		overrides.add(propertyArg);
 		return propertyArg;
 	}
 
-	/** The related Spring application context.*/
+	/** The related Spring application context. */
 	protected ApplicationContext getContext() {
 		return (ApplicationContext) getProject().getReference(
 				SlcProjectHelper.REF_ROOT_CONTEXT);