You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by gn...@apache.org on 2009/09/04 08:37:46 UTC
svn commit: r811229 - in /geronimo/xbean/trunk: pom.xml
xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
Author: gnodet
Date: Fri Sep 4 06:37:46 2009
New Revision: 811229
URL: http://svn.apache.org/viewvc?rev=811229&view=rev
Log:
XBEAN-132: Class loading issues
Modified:
geronimo/xbean/trunk/pom.xml
geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=811229&r1=811228&r2=811229&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Fri Sep 4 06:37:46 2009
@@ -202,19 +202,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.0.5</version>
+ <version>2.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.0.5</version>
+ <version>2.5.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.0.5</version>
+ <version>2.5.6</version>
</dependency>
<dependency>
Modified: geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java?rev=811229&r1=811228&r2=811229&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java (original)
+++ geronimo/xbean/trunk/xbean-spring/src/main/java/org/apache/xbean/spring/context/v2c/XBeanNamespaceHandler.java Fri Sep 4 06:37:46 2009
@@ -63,6 +63,7 @@
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.util.StringUtils;
+import org.springframework.core.io.ResourceLoader;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -236,7 +237,11 @@
return bd.getBeanClass();
}
try {
- ClassLoader cl = parserContext.getReaderContext().getReader().getBeanClassLoader();
+ ResourceLoader rl = parserContext.getReaderContext().getResourceLoader();
+ ClassLoader cl = rl != null ? rl.getClassLoader() : null;
+ if (cl == null) {
+ cl = parserContext.getReaderContext().getReader().getBeanClassLoader();
+ }
if (cl == null) {
cl = Thread.currentThread().getContextClassLoader();
}