From dc30810936b5397e90e1309e6eb646c20ad0b4a1 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 9 Jun 2017 15:31:51 +0200 Subject: [PATCH] DATACMNS-764 - Fix ClassLoader lookup in XmlRepositoryConfigurationSource. As per @jhoeller's recommendation, we now use the ResourceLoader's ClassLoader instead of the bean ClassLoader exposed by the XmlReaderContext. The latter can apparently be null outside certain lifecycle phases. Related pull request: #201. --- .../repository/config/XmlRepositoryConfigurationSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java index 3dd1646dc..6fceacd61 100644 --- a/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java +++ b/src/main/java/org/springframework/data/repository/config/XmlRepositoryConfigurationSource.java @@ -64,7 +64,7 @@ public class XmlRepositoryConfigurationSource extends RepositoryConfigurationSou */ public XmlRepositoryConfigurationSource(Element element, ParserContext context, Environment environment) { - super(environment, context.getReaderContext().getBeanClassLoader()); + super(environment, context.getReaderContext().getResourceLoader().getClassLoader()); Assert.notNull(element, "Element must not be null!"); Assert.notNull(context, "Context must not be null!");