X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fspring%2FSpringUtils.java;h=2b7569f882891cc29ee7e7ed070b19a3b5a4936a;hb=f4ab9744b918f5358bb6283c224ec3b51b05fe95;hp=e31dbcc59670f1e3ab6e503c34ca67acf71b4bca;hpb=aaa6551ed00ba292b33a19183058c5e8ec97ef64;p=gpl%2Fargeo-slc.git

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..2b7569f88 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
@@ -2,13 +2,11 @@ package org.argeo.slc.spring;
 
 import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.SlcException;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -21,9 +19,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;
 		}