svn commit: r1026674 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java

[lukaszlenart]

Author: lukaszlenart
Date: Sat Oct 23 20:02:08 2010
New Revision: 1026674

URL: http://svn.apache.org/viewvc?rev=1026674&view=rev
Log:
Solved WW-3460 - improved spring bean lookup

Modified:
    
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java?rev=1026674&r1=1026673&r2=1026674&view=diff
==============================================================================
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
 Sat Oct 23 20:02:08 2010
@@ -20,7 +20,6 @@ import com.opensymphony.xwork2.inject.In
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
@@ -137,9 +136,10 @@ public class SpringObjectFactory extends
     @Override
     public Object buildBean(String beanName, Map<String, Object> extraContext, 
boolean injectInternal) throws Exception {
         Object o = null;
-        try {
+        
+        if (appContext.containsBeanDefinition(beanName)) {
             o = appContext.getBean(beanName);
-        } catch (NoSuchBeanDefinitionException e) {
+        } else {
             Class beanClazz = getClassInstance(beanName);
             o = buildBean(beanClazz, extraContext);
         }