You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/09/07 02:58:19 UTC
svn commit: r993189 - in
/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring:
SpringBeanLocator.java injection/annot/AnnotProxyFieldValueFactory.java
Author: ivaynberg
Date: Tue Sep 7 00:58:19 2010
New Revision: 993189
URL: http://svn.apache.org/viewvc?rev=993189&view=rev
Log:
WICKET-3033
Modified:
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
Modified: wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?rev=993189&r1=993188&r2=993189&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java (original)
+++ wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java Tue Sep 7 00:58:19 2010
@@ -188,7 +188,7 @@ public class SpringBeanLocator implement
BeanFactory parent = beanFactory.getParentBeanFactory();
if (parent != null && parent instanceof ConfigurableListableBeanFactory)
{
- return getBeanDefinition(beanFactory, name);
+ return getBeanDefinition((ConfigurableListableBeanFactory)parent, name);
}
else
{
Modified: wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java?rev=993189&r1=993188&r2=993189&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java (original)
+++ wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java Tue Sep 7 00:58:19 2010
@@ -254,7 +254,7 @@ public class AnnotProxyFieldValueFactory
BeanFactory parent = beanFactory.getParentBeanFactory();
if (parent != null && parent instanceof ConfigurableListableBeanFactory)
{
- return getBeanDefinition(beanFactory, name);
+ return getBeanDefinition((ConfigurableListableBeanFactory)parent, name);
}
else
{