From 4e34ede292add9a4518f78848bdf76f9b4944f6f Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 10 Oct 2006 19:31:56 +0000
Subject: [PATCH] re PR xml/29362 (NullPointerException in
 gnu.xml.transform.TransformerImpl.strip(libgcj.so.7rh))

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

From-SVN: r117612
---
 libjava/classpath/ChangeLog.gcj                          | 6 ++++++
 libjava/classpath/gnu/xml/transform/TransformerImpl.java | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 56d1cb91144..9ed4b4c3a16 100644
--- 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 732a911bd8c..f43b6602f23 100644
--- 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();