svn commit: r948228 - /wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java

[gseitz]

Author: gseitz
Date: Tue May 25 22:40:21 2010
New Revision: 948228

URL: http://svn.apache.org/viewvc?rev=948228&view=rev
Log:
Applied WICKET-2771

Modified:
    
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java

Modified: 
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java?rev=948228&r1=948227&r2=948228&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
 Tue May 25 22:40:21 2010
@@ -30,7 +30,10 @@ import org.apache.wicket.spring.SpringBe
 import org.apache.wicket.util.lang.Generics;
 import org.apache.wicket.util.string.Strings;
 import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractApplicationContext;
 
 /**
  * {...@link IFieldValueFactory} that uses {...@link LazyInitProxyFactory} to 
create proxies for Spring
@@ -196,6 +199,21 @@ public class AnnotProxyFieldValueFactory
                }
                else if (names.size() > 1)
                {
+                       if (ctx instanceof AbstractApplicationContext)
+                       {
+                               for (String name : names)
+                               {
+                                       BeanDefinition beanDef = 
((AbstractApplicationContext)ctx).getBeanFactory()
+                                                       
.getBeanDefinition(name);
+                                       if (beanDef instanceof 
AbstractBeanDefinition)
+                                       {
+                                               if 
(((AbstractBeanDefinition)beanDef).isPrimary())
+                                               {
+                                                       return name;
+                                               }
+                                       }
+                               }
+                       }
                        StringBuilder msg = new StringBuilder();
                        msg.append("more then one bean of type [");
                        msg.append(clazz.getName());