cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r376365 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers: HTMLSerializer.java XHTMLSerializer.java
Date Thu, 09 Feb 2006 18:03:22 GMT
Author: pier
Date: Thu Feb  9 10:03:21 2006
New Revision: 376365

URL: http://svn.apache.org/viewcvs?rev=376365&view=rev
Log:
Fixing NPE when using "null" default document type in HTML serializer

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java?rev=376365&r1=376364&r2=376365&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/HTMLSerializer.java
Thu Feb  9 10:03:21 2006
@@ -153,7 +153,7 @@
             this.doctype = HTML401_DOCTYPE_TRANSITIONAL;
         } else if (XHTML1_DOCTYPE_FRAMESET.equals(this.doctype)) {
             this.doctype = HTML401_DOCTYPE_FRAMESET;
-        } else {
+        } else if (this.doctype != null) {
             /* The root element is uppercase, always!!! */
             this.doctype = new DocType(this.doctype.getName().toUpperCase(),
                                        this.doctype.getPublicId(),

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java?rev=376365&r1=376364&r2=376365&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/XHTMLSerializer.java
Thu Feb  9 10:03:21 2006
@@ -21,7 +21,6 @@
 import org.apache.cocoon.components.serializers.util.DocType;
 import org.xml.sax.SAXException;
 
-
 /**
  * <p>A pedantinc XHTML serializer encoding all recognized entities with their
  * proper HTML names.</p> 



Mime
View raw message