You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mi...@apache.org on 2003/10/06 16:35:48 UTC

cvs commit: xml-xalan/java/src/org/apache/xml/serializer ToStream.java ToTextStream.java ToUnknownStream.java SerializationHandler.java EmptySerializer.java ToHTMLSAXHandler.java ToSAXHandler.java

minchau     2003/10/06 07:35:48

  Modified:    java/src/org/apache/xml/serializer Tag: xslt20-compiled
                        ToStream.java ToTextStream.java
                        ToUnknownStream.java SerializationHandler.java
                        EmptySerializer.java ToHTMLSAXHandler.java
                        ToSAXHandler.java
  Log:
  
  PR: bugzilla 21471
  Submitted by:	Joanne Tong
  Reviewed by:	Brian Minchau
  Stop some SAXExceptions from being quietly caught by the serializer.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.21.2.3  +1 -1      xml-xalan/java/src/org/apache/xml/serializer/ToStream.java
  
  Index: ToStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToStream.java,v
  retrieving revision 1.21.2.2
  retrieving revision 1.21.2.3
  diff -u -r1.21.2.2 -r1.21.2.3
  --- ToStream.java	5 Oct 2003 14:01:57 -0000	1.21.2.2
  +++ ToStream.java	6 Oct 2003 14:35:48 -0000	1.21.2.3
  @@ -2700,7 +2700,7 @@
        * This method flushes any pending events, which can be startDocument()
        * closing the opening tag of an element, or closing an open CDATA section.
        */
  -    public void flushPending()
  +    public void flushPending() throws SAXException
       {
           try
           {
  
  
  
  1.11.2.1  +1 -1      xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java
  
  Index: ToTextStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- ToTextStream.java	13 Aug 2003 05:53:41 -0000	1.11
  +++ ToTextStream.java	6 Oct 2003 14:35:48 -0000	1.11.2.1
  @@ -662,7 +662,7 @@
           // no namespace support for HTML
       }    
   
  -    public void flushPending()
  +    public void flushPending() throws org.xml.sax.SAXException
       {
           try
           {
  
  
  
  1.5.2.1   +1 -1      xml-xalan/java/src/org/apache/xml/serializer/ToUnknownStream.java
  
  Index: ToUnknownStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToUnknownStream.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ToUnknownStream.java	25 Jun 2003 17:05:02 -0000	1.5
  +++ ToUnknownStream.java	6 Oct 2003 14:35:48 -0000	1.5.2.1
  @@ -1223,7 +1223,7 @@
       /**
        * @see org.apache.xml.serializer.SerializationHandler#flushPending()
        */
  -    public void flushPending()
  +    public void flushPending() throws SAXException
       {
    
           flush();
  
  
  
  1.2.4.1   +1 -1      xml-xalan/java/src/org/apache/xml/serializer/SerializationHandler.java
  
  Index: SerializationHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializationHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- SerializationHandler.java	8 Apr 2003 01:53:45 -0000	1.2
  +++ SerializationHandler.java	6 Oct 2003 14:35:48 -0000	1.2.4.1
  @@ -146,7 +146,7 @@
        * flush any input that the serializer has which it has not yet sent as
        * output.
        */
  -    public void flushPending();
  +    public void flushPending() throws SAXException;
   
   
   }
  
  
  
  1.2.2.1   +1 -1      xml-xalan/java/src/org/apache/xml/serializer/EmptySerializer.java
  
  Index: EmptySerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/EmptySerializer.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- EmptySerializer.java	23 Jun 2003 20:49:50 -0000	1.2
  +++ EmptySerializer.java	6 Oct 2003 14:35:48 -0000	1.2.2.1
  @@ -232,7 +232,7 @@
       /**
        * @see org.apache.xml.serializer.SerializationHandler#flushPending()
        */
  -    public void flushPending()
  +    public void flushPending() throws SAXException
       {
           throwUnimplementedException();
       }
  
  
  
  1.5.2.1   +1 -1      xml-xalan/java/src/org/apache/xml/serializer/ToHTMLSAXHandler.java
  
  Index: ToHTMLSAXHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToHTMLSAXHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- ToHTMLSAXHandler.java	25 Jun 2003 17:05:02 -0000	1.5
  +++ ToHTMLSAXHandler.java	6 Oct 2003 14:35:48 -0000	1.5.2.1
  @@ -646,7 +646,7 @@
        * This method flushes any pending events, which can be startDocument()
        * closing the opening tag of an element, or closing an open CDATA section.
        */
  -    public void flushPending()
  +    public void flushPending() throws SAXException
       {
   		if (m_needToCallStartDocument)
   		{
  
  
  
  1.6.2.1   +2 -9      xml-xalan/java/src/org/apache/xml/serializer/ToSAXHandler.java
  
  Index: ToSAXHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToSAXHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- ToSAXHandler.java	25 Jun 2003 17:05:02 -0000	1.6
  +++ ToSAXHandler.java	6 Oct 2003 14:35:48 -0000	1.6.2.1
  @@ -283,10 +283,9 @@
        * This method flushes any pending events, which can be startDocument()
        * closing the opening tag of an element, or closing an open CDATA section.
        */
  -    public void flushPending()
  +    public void flushPending() throws SAXException
       {
  -        try
  -        {
  +    
               if (m_needToCallStartDocument)
               {
                   startDocumentInternal();
  @@ -304,12 +303,6 @@
                   closeCDATA();
                   m_cdataTagOpen = false;
               }
  -        }
  -        catch (SAXException e)
  -        {
  -            // can we do anything useful here,
  -            // or should this method throw a SAXException?
  -        }
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org