geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r420790 - in /geronimo/xbean/trunk: xbean-spring-itests/pom.xml xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java
Date Tue, 11 Jul 2006 10:27:01 GMT
Author: jstrachan
Date: Tue Jul 11 03:26:58 2006
New Revision: 420790

URL: http://svn.apache.org/viewvc?rev=420790&view=rev
Log:
Added a trivial patch to fix bug XBEAN-23 as passing in a null ClassLoader now breaks spring-2.0-rc2
along with enabling an integration test with 2.0-rc2

Modified:
    geronimo/xbean/trunk/xbean-spring-itests/pom.xml
    geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java

Modified: geronimo/xbean/trunk/xbean-spring-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-itests/pom.xml?rev=420790&r1=420789&r2=420790&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-itests/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-spring-itests/pom.xml Tue Jul 11 03:26:58 2006
@@ -18,6 +18,7 @@
     <module>1.2.8</module>
     <module>2.0-m5</module>
     <module>2.0-rc1</module>
+    <module>2.0-rc2</module>
   </modules>
   <dependencyManagement>
     <dependencies>

Modified: geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java?rev=420790&r1=420789&r2=420790&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java
(original)
+++ geronimo/xbean/trunk/xbean-spring-v2/src/main/java/org/apache/xbean/spring/context/v2/XBeanXmlBeanDefinitionReader.java
Tue Jul 11 03:26:58 2006
@@ -78,7 +78,11 @@
     }
 
     protected NamespaceHandlerResolver createDefaultNamespaceHandlerResolver() {
-        return new XBeanNamespaceHandlerResolver(getBeanClassLoader());
+        ClassLoader classLoader = getBeanClassLoader();
+        if (classLoader == null) {
+            classLoader = Thread.currentThread().getContextClassLoader();
+        }
+        return new XBeanNamespaceHandlerResolver(classLoader);
     }
     
     private void preprocess(Document doc) {



Mime
View raw message