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:33:07 UTC
cvs commit: xml-xalan/java/src/org/apache/xml/serializer ToUnknownStream.java EmptySerializer.java ToHTMLSAXHandler.java SerializationHandler.java ToStream.java ToSAXHandler.java ToTextStream.java
minchau 2003/10/06 07:33:07
Modified: java/src/org/apache/xml/serializer ToUnknownStream.java
EmptySerializer.java ToHTMLSAXHandler.java
SerializationHandler.java ToStream.java
ToSAXHandler.java ToTextStream.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
1.6 +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.6
diff -u -r1.5 -r1.6
--- ToUnknownStream.java 25 Jun 2003 17:05:02 -0000 1.5
+++ ToUnknownStream.java 6 Oct 2003 14:33:07 -0000 1.6
@@ -1223,7 +1223,7 @@
/**
* @see org.apache.xml.serializer.SerializationHandler#flushPending()
*/
- public void flushPending()
+ public void flushPending() throws SAXException
{
flush();
1.3 +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.3
diff -u -r1.2 -r1.3
--- EmptySerializer.java 23 Jun 2003 20:49:50 -0000 1.2
+++ EmptySerializer.java 6 Oct 2003 14:33:07 -0000 1.3
@@ -232,7 +232,7 @@
/**
* @see org.apache.xml.serializer.SerializationHandler#flushPending()
*/
- public void flushPending()
+ public void flushPending() throws SAXException
{
throwUnimplementedException();
}
1.6 +3 -11 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.6
diff -u -r1.5 -r1.6
--- ToHTMLSAXHandler.java 25 Jun 2003 17:05:02 -0000 1.5
+++ ToHTMLSAXHandler.java 6 Oct 2003 14:33:07 -0000 1.6
@@ -646,25 +646,17 @@
* 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)
{
- try {startDocumentInternal();
+ startDocumentInternal();
m_needToCallStartDocument = false;
- } catch (SAXException e) {}
}
// Close any open element
if (m_elemContext.m_startTagOpen)
{
- try
- {
- closeStartTag();
- }
- catch(SAXException se)
- {
- // do something ??
- }
+ closeStartTag();
m_elemContext.m_startTagOpen = false;
}
}
1.3 +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.3
diff -u -r1.2 -r1.3
--- SerializationHandler.java 8 Apr 2003 01:53:45 -0000 1.2
+++ SerializationHandler.java 6 Oct 2003 14:33:07 -0000 1.3
@@ -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.23 +1 -10 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ToStream.java 5 Oct 2003 14:10:45 -0000 1.22
+++ ToStream.java 6 Oct 2003 14:33:07 -0000 1.23
@@ -2700,11 +2700,8 @@
* 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();
@@ -2721,12 +2718,6 @@
closeCDATA();
m_cdataTagOpen = false;
}
- }
- catch (SAXException e)
- { // can we do anything useful here,
- // or should this method throw a SAXException?
- }
-
}
public void setContentHandler(ContentHandler ch)
1.7 +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.7
diff -u -r1.6 -r1.7
--- ToSAXHandler.java 25 Jun 2003 17:05:02 -0000 1.6
+++ ToSAXHandler.java 6 Oct 2003 14:33:07 -0000 1.7
@@ -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?
- }
}
1.12 +1 -8 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.12
diff -u -r1.11 -r1.12
--- ToTextStream.java 13 Aug 2003 05:53:41 -0000 1.11
+++ ToTextStream.java 6 Oct 2003 14:33:07 -0000 1.12
@@ -662,19 +662,12 @@
// no namespace support for HTML
}
- public void flushPending()
+ public void flushPending() throws org.xml.sax.SAXException
{
- try
- {
if (m_needToCallStartDocument)
{
startDocumentInternal();
m_needToCallStartDocument = 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