cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/sax XMLByteStreamCompiler.java
Date Fri, 07 Nov 2003 14:28:28 GMT
joerg       2003/11/07 06:28:28

  Modified:    .        status.xml
               src/java/org/apache/cocoon/components/sax
                        XMLByteStreamCompiler.java
  Log:
  XMLByteStreamCompiler now handles also text nodes longer than 32 k (thanks to Simon Mieth)
  
  Revision  Changes    Path
  1.188     +11 -8     cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.187
  retrieving revision 1.188
  diff -u -r1.187 -r1.188
  --- status.xml	7 Nov 2003 11:53:47 -0000	1.187
  +++ status.xml	7 Nov 2003 14:28:27 -0000	1.188
  @@ -192,21 +192,24 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="JH" type="fix" fixes-bug="23299" due-to-email="simon.mieth@t-online.de"
due-to="Simon Mieth">
  +     XMLByteStreamCompiler now handles also text nodes longer than 32 k.
  +   </action>
      <action dev="CZ" type="fix" fixes-bug="23538" due-to-email="samc@atnet.net.au" due-to="Sam
Coward">
        Applying patch from Sam Coward (samc@atnet.net.au) for reducing 
        setDocumentLocator calls in JXTemplateGenerator and JXFormsGenerator.
  -  </action>
  +   </action>
      <action dev="BD" type="add" fixes-bug="24294" due-to="Jelle Alten" due-to-email="jelle@ordina.nl">
        sitemap-viewer added to the scratchpad samples
  -  </action>
  - <action dev="AG" type="fix" fixes-bug="19638" due-to-email="Grigorios.Merenidis@Dresdner-Bank.com"
due-to="Grigorios Merenidis">
  +   </action>
  +   <action dev="AG" type="fix" fixes-bug="19638" due-to-email="Grigorios.Merenidis@Dresdner-Bank.com"
due-to="Grigorios Merenidis">
        Fix HSSFSerializer Bug: Same cell definitions blows document. Applying
        patch from Grigorios Merenidis (Grigorios.Merenidis@Dresdner-Bank.com).
  -  </action>
  +   </action>
      <action dev="CZ" type="fix" fixes-bug="24326" due-to-email="andrzej@chaeron.com"
due-to="Andrzej Taramina">
        SQLTransformer: Correcting handling of XML data with XML declarations. Applying
        patch from Andrzej Taramina (andrzej@chaeron.com).
  -  </action>
  +   </action>
      <action dev="CZ" type="fix" due-to="Volker Schmitt">
        Fixing threading problems in the ExtendedComponentSelector.
      </action>
  @@ -216,14 +219,14 @@
      <action dev="CZ" type="fix" due-to="Andrea Poeschl" due-to-email="poeschel@aidossoftware.com">
         Fixing precompilation of the XSPs for the CLI.
      </action>
  -    <action dev="BRD" type="update">
  +   <action dev="BRD" type="update">
         Woody: in the form definition, for widgets that have child widgets, those
         child widgets should now be embedded inside a wd:widgets element.
         Practical update information can be found 
         <link href="http://wiki.cocoondev.org/Wiki.jsp?page=WoodySyntaxUpdateForWidgetsElement">
         in the wiki</link>.
      </action>
  -    <action dev="AG" type="update">
  +   <action dev="AG" type="update">
        Updated Xalan to 2.5.2
      </action>
      <action dev="BRD" type="update">
  
  
  
  1.3       +9 -3      cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
  
  Index: XMLByteStreamCompiler.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLByteStreamCompiler.java	9 Jul 2003 17:53:03 -0000	1.2
  +++ XMLByteStreamCompiler.java	7 Nov 2003 14:28:27 -0000	1.3
  @@ -312,8 +312,14 @@
               }
           }
   
  -        if (utflen > 0x00007FFF)
  -            throw new SAXException("UTFDataFormatException: String cannot be longer than
32k.");
  +        if (utflen > 0x00007FFF) {
  +            // handling "UTFDataFormatException: String cannot be longer than 32k."
  +            int split = length / 2;
  +            writeChars(ch, start, length - split);
  +            writeEvent(CHARACTERS);
  +            writeChars(ch, start + length - split, split);
  +            return;
  +        }
   
           byte[] bytearr = new byte[utflen+2];
           bytearr[count++] = (byte) ((utflen >>> 8) & 0xFF);
  
  
  

Mime
View raw message