From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 27 Jun 2008 12:39:01 +0000 (+0000)
Subject: Restrict automatic beans lookup (no eager it of factory beans)
X-Git-Tag: argeo-slc-2.1.7~2749
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=326115a7da254a9f511a98e476059a26fda4efd2;hp=aaa6551ed00ba292b33a19183058c5e8ec97ef64;p=gpl%2Fargeo-slc.git

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 e31dbcc59..7e01f3235 100644
--- 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) {
 		// Map<String, T> beans = context.getBeansOfType(clss);
 		Map<String, T> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(
-				context, clss);
+				context, clss, false, false);
 		if (beans.size() == 1) {
 			return beans.values().iterator().next();
+		} else if (beans.size() > 1) {
+			if (log.isDebugEnabled()) {
+				log
+						.debug(("Found more that on bean for type " + clss
+								+ ": " + beans.keySet()));
+			}
+			return null;
 		} else {
 			return null;
 		}