Restrict automatic beans lookup (no eager it of factory beans)

git-svn-id: https://svn.argeo.org/slc/trunk@1293 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
index e31dbcc59670f1e3ab6e503c34ca67acf71b4bca..7e01f3235840dffe9093e027c69e4a6fe86cdc35 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
@@ -21,9 +21,16 @@ public class SpringUtils {
                        Class<T> clss) {\r
                // Map<String, T> beans = context.getBeansOfType(clss);\r
                Map<String, T> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(\r
-                               context, clss);\r
+                               context, clss, false, false);\r
                if (beans.size() == 1) {\r
                        return beans.values().iterator().next();\r
+               } else if (beans.size() > 1) {\r
+                       if (log.isDebugEnabled()) {\r
+                               log\r
+                                               .debug(("Found more that on bean for type " + clss\r
+                                                               + ": " + beans.keySet()));\r
+                       }\r
+                       return null;\r
                } else {\r
                        return null;\r
                }\r