You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/08/04 11:23:56 UTC
svn commit: r800713 -
/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
Author: veithen
Date: Tue Aug 4 09:23:52 2009
New Revision: 800713
URL: http://svn.apache.org/viewvc?rev=800713&view=rev
Log:
Avoid NPE in StAX dialect detector if StAX implementation is part of the JRE.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java?rev=800713&r1=800712&r2=800713&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java Tue Aug 4 09:23:52 2009
@@ -214,6 +214,9 @@
private static Class loadClass(ClassLoader classLoader, URL rootUrl, String name) {
try {
+ if (classLoader == null) {
+ classLoader = ClassLoader.getSystemClassLoader();
+ }
Class cls = classLoader.loadClass(name);
// Cross check if the class was loaded from the same location (JAR)
return rootUrl.equals(getRootUrlForClass(cls)) ? cls : null;