diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-10-10 19:31:56 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-10-10 19:31:56 +0000 |
| commit | 4e34ede292add9a4518f78848bdf76f9b4944f6f (patch) | |
| tree | 29c5bc8c86796aae7414bd40283a6c4c0a953808 | |
| parent | ab6b9a13d05d17c29b8a95161d255609703ab29b (diff) | |
| download | gcc-4e34ede292add9a4518f78848bdf76f9b4944f6f.zip gcc-4e34ede292add9a4518f78848bdf76f9b4944f6f.tar.gz gcc-4e34ede292add9a4518f78848bdf76f9b4944f6f.tar.bz2 | |
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
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 6 | ||||
| -rw-r--r-- | libjava/classpath/gnu/xml/transform/TransformerImpl.java | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 56d1cb9..9ed4b4c3 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 732a911..f43b660 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(); |