svn commit: r991626 - /webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java

[veithen]

Author: veithen
Date: Wed Sep  1 17:56:12 2010
New Revision: 991626

URL: http://svn.apache.org/viewvc?rev=991626&view=rev
Log:
WSCOMMONS-558: Fixed an issue causing a failure in the new 
axiom-staxdialect-tests module when running on Java 1.6.

Modified:
    
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java?rev=991626&r1=991625&r2=991626&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-staxdialect-tests/src/test/java/org/apache/axiom/util/stax/dialect/DialectTest.java
 Wed Sep  1 17:56:12 2010
@@ -62,7 +62,8 @@ public class DialectTest extends TestSui
             Thread.currentThread().setContextClassLoader(classLoader);
             try {
                 XMLInputFactory factory = XMLInputFactory.newInstance();
-                if (factory.getClass().getClassLoader() != classLoader) {
+                if (classLoader != ClassLoader.getSystemClassLoader()
+                        && factory.getClass().getClassLoader() != classLoader) 
{
                     throw new FactoryConfigurationError("Wrong factory!");
                 }
                 return factory;
@@ -93,7 +94,8 @@ public class DialectTest extends TestSui
             Thread.currentThread().setContextClassLoader(classLoader);
             try {
                 XMLOutputFactory factory = XMLOutputFactory.newInstance();
-                if (factory.getClass().getClassLoader() != classLoader) {
+                if (classLoader != ClassLoader.getSystemClassLoader()
+                        && factory.getClass().getClassLoader() != classLoader) 
{
                     throw new FactoryConfigurationError("Wrong factory!");
                 }
                 return factory;