Author: dkulp
Date: Wed Aug 11 17:41:00 2010
New Revision: 984491
URL: http://svn.apache.org/viewvc?rev=984491&view=rev
Log:
Merged revisions 984454 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r984454 | dkulp | 2010-08-11 11:57:37 -0400 (Wed, 11 Aug 2010) | 1 line
[CXF-2919] Add an NPE guard
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=984491&r1=984490&r2=984491&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Wed Aug 11 17:41:00 2010
@@ -784,7 +784,9 @@ public final class StaxUtils {
}
case Node.DOCUMENT_TYPE_NODE:
try {
- writer.writeDTD(((DocumentType)n).getTextContent());
+ if (((DocumentType)n).getTextContent() != null) {
+ writer.writeDTD(((DocumentType)n).getTextContent());
+ }
} catch (UnsupportedOperationException ex) {
//can we ignore? DOM writers really don't allow this
//as there isn't a way to write a DTD in dom
