Author: mrdon
Date: Tue Nov 14 19:26:02 2006
New Revision: 475105
URL: http://svn.apache.org/viewvc?view=rev&rev=475105
Log:
Added check to not delegate to objectfactory when unknown bean is object factory
WW-1491
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?view=diff&rev=475105&r1=475104&r2=475105
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Tue Nov 14 19:26:02 2006
@@ -186,7 +186,9 @@
if (LOG.isDebugEnabled()) {
LOG.info("Choosing bean ("+foundName+") for "+type+"
to be loaded from the ObjectFactory");
}
- builder.factory(type, new
ObjectFactoryDelegateFactory(foundName), scope);
+ if (ObjectFactory.class != type) {
+ builder.factory(type, new
ObjectFactoryDelegateFactory(foundName), scope);
+ }
}
}
} else {
