SF.net SVN: xmlunit: [219] trunk/xmlunit/src/java/org/custommonkey/xmlunit

[<bo...@us...>]

Revision: 219
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=219&view=rev
Author:   bodewig
Date:     2007-06-26 23:50:33 -0700 (Tue, 26 Jun 2007)

Log Message:
-----------
Fix for Bug 1742826

Modified Paths:
--------------
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/Transform.java
    trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/Transform.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/Transform.java	2007-06-27 06:50:14 UTC (rev 218)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/Transform.java	2007-06-27 06:50:33 UTC (rev 219)
@@ -196,9 +196,6 @@
             Transformer t = stylesheetSource == null
                 ? factory.newTransformer()
                 : factory.newTransformer(stylesheetSource);
-            if (XMLUnit.getURIResolver() != null) {
-                t.setURIResolver(XMLUnit.getURIResolver());
-            }
             return t;
         } catch (javax.xml.transform.TransformerConfigurationException ex) {
             throw new ConfigurationException(ex);

Modified: trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java
===================================================================
--- trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java	2007-06-27 06:50:14 UTC (rev 218)
+++ trunk/xmlunit/src/java/org/custommonkey/xmlunit/XMLUnit.java	2007-06-27 06:50:33 UTC (rev 219)
@@ -397,6 +397,9 @@
     public static TransformerFactory getTransformerFactory() {
         if (transformerFactory == null) {
             transformerFactory = TransformerFactory.newInstance();
+            if (uriResolver != null) {
+                transformerFactory.setURIResolver(uriResolver);
+            }
         }
         return transformerFactory;
     }
@@ -405,7 +408,11 @@
      * Sets the URIResolver to use during transformations.
      */
     public static void setURIResolver(URIResolver resolver) {
-        uriResolver = resolver;
+        if (uriResolver != resolver) {
+            uriResolver = resolver;
+            transformerFactory = null;
+            getTransformerFactory();
+        }
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.