svn commit: r1432249 - /maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java

[krosenvold]

Author: krosenvold
Date: Fri Jan 11 19:49:42 2013
New Revision: 1432249

URL: http://svn.apache.org/viewvc?rev=1432249&view=rev
Log:
[SUREFIRE-950] Wrong parser instantiated

Modified:
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java?rev=1432249&r1=1432248&r2=1432249&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomBuilder.java
 Fri Jan 11 19:49:42 2013
@@ -27,6 +27,7 @@ import org.xml.sax.helpers.DefaultHandle
 
 import javax.annotation.Nonnull;
 import javax.annotation.WillClose;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -65,7 +66,7 @@ public class Xpp3DomBuilder
     }
 
     public static Xpp3Dom build( @WillClose Reader reader, boolean trim )
-            throws XmlPullParserException
+        throws XmlPullParserException
     {
         try
         {
@@ -82,6 +83,9 @@ public class Xpp3DomBuilder
         throws XmlPullParserException
     {
 
+        String key = "org.xml.sax.driver";
+        String oldParser = System.getProperty( key );
+        System.clearProperty( key ); // There's a slight problem with this an 
parallel maven
         try
         {
             DocHandler ch = new DocHandler( trim );
@@ -98,6 +102,13 @@ public class Xpp3DomBuilder
         {
             throw new XmlPullParserException( e );
         }
+        finally
+        {
+            if ( oldParser != null )
+            {
+                System.setProperty( key, oldParser );
+            }
+        }
     }
 
     private static class DocHandler
@@ -109,7 +120,9 @@ public class Xpp3DomBuilder
 
         // Todo: Use these for something smart !
         private final List<SAXParseException> warnings = new 
ArrayList<SAXParseException>();
+
         private final List<SAXParseException> errors = new 
ArrayList<SAXParseException>();
+
         private final List<SAXParseException> fatals = new 
ArrayList<SAXParseException>();