X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fspring%2FSpringUtils.java;fp=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fspring%2FSpringUtils.java;h=e31dbcc59670f1e3ab6e503c34ca67acf71b4bca;hb=aaa6551ed00ba292b33a19183058c5e8ec97ef64;hp=cbc5c6abfc21e60eaeb076e27ae0e9f6c668fd04;hpb=60a3b9e541a6a085393fac1e0e677081ed98583e;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 cbc5c6abf..e31dbcc59 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
@@ -8,6 +8,8 @@ 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;
 import org.springframework.core.io.Resource;
@@ -17,7 +19,9 @@ public class SpringUtils {
 
 	public static <T> T loadSingleFromContext(ListableBeanFactory context,
 			Class<T> clss) {
-		Map<String, T> beans = context.getBeansOfType(clss);
+		// Map<String, T> beans = context.getBeansOfType(clss);
+		Map<String, T> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(
+				context, clss);
 		if (beans.size() == 1) {
 			return beans.values().iterator().next();
 		} else {