re PR xml/29362 (NullPointerException in gnu.xml.transform.TransformerImpl.strip...

	PR classpath/29362:
	* gnu/xml/transform/TransformerImpl.java (transform): Only strip if
	there is a stylesheet.

From-SVN: r117612

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 56d1cb91144da9ba4c78de714916bb37fff984b2..9ed4b4c3a16c2a87ef82c428d9d34cd1e723431c 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2006-10-10  Tom Tromey  <tromey@redhat.com>
+
+       PR classpath/29362:
+       * gnu/xml/transform/TransformerImpl.java (transform): Only strip if
+       there is a stylesheet.
+
 2006-10-05  Gary Benson  <gbenson@redhat.com>
 
        * java/net/SocketPermission.java

diff --git a/libjava/classpath/gnu/xml/transform/TransformerImpl.java b/libjava/classpath/gnu/xml/transform/TransformerImpl.java
index 732a911bd8c255387d39d4ac4fde6c628b9df8b7..f43b6602f23104b5ce7a34114db11881083d9477 100644 (file)
--- a/libjava/classpath/gnu/xml/transform/TransformerImpl.java
+++ b/libjava/classpath/gnu/xml/transform/TransformerImpl.java
@@ -327,7 +327,8 @@ class TransformerImpl
             domDoc.setCheckWellformedness(false);
           }
         parent.normalize();
-        strip(stylesheet, parent);
+        if (stylesheet != null)
+          strip(stylesheet, parent);
         Document resultDoc = (parent instanceof Document) ?
           (Document) parent :
           parent.getOwnerDocument();