minchau 2003/05/06 12:25:30
Modified: java/src/org/apache/xml/serializer SerializerBase.java
Log:
Fix for flushing occuring in trace code even when tracing is not being done.
PR: bugzilla 19471
Submitted by: Brian Minchau
Reviewed by: Ilene Seelemann
Revision Changes Path
1.3 +45 -23
xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java
Index: SerializerBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializerBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SerializerBase.java 8 Apr 2003 01:53:45 -0000 1.2
+++ SerializerBase.java 6 May 2003 19:25:30 -0000 1.3
@@ -95,9 +95,11 @@
protected void fireEndElem(String name)
throws org.xml.sax.SAXException
{
- flushMyWriter();
if (m_tracer != null)
-
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENDELEMENT,name,
(Attributes)null);
+ {
+ flushMyWriter();
+
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENDELEMENT,name,
(Attributes)null);
+ }
}
/**
@@ -109,9 +111,11 @@
protected void fireCharEvent(char[] chars, int start, int length)
throws org.xml.sax.SAXException
{
- flushMyWriter();
if (m_tracer != null)
- m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_CHARACTERS,
chars, start,length);
+ {
+ flushMyWriter();
+ m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_CHARACTERS,
chars, start,length);
+ }
}
/**
@@ -1041,10 +1045,12 @@
*/
protected void fireStartEntity(String name)
throws org.xml.sax.SAXException
- {
- flushMyWriter();
+ {
if (m_tracer != null)
- m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENTITYREF,
name);
+ {
+ flushMyWriter();
+ m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENTITYREF,
name);
+ }
}
/**
@@ -1093,9 +1099,11 @@
protected void fireCDATAEvent(char[] chars, int start, int length)
throws org.xml.sax.SAXException
{
- flushMyWriter();
if (m_tracer != null)
-
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_CDATA, chars,
start,length);
+ {
+ flushMyWriter();
+
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_CDATA, chars,
start,length);
+ }
}
/**
@@ -1107,9 +1115,11 @@
protected void fireCommentEvent(char[] chars, int start, int length)
throws org.xml.sax.SAXException
{
- flushMyWriter();
if (m_tracer != null)
-
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_COMMENT, new String(chars,
start, length));
+ {
+ flushMyWriter();
+
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_COMMENT, new String(chars,
start, length));
+ }
}
@@ -1120,7 +1130,8 @@
public void fireEndEntity(String name)
throws org.xml.sax.SAXException
{
- flushMyWriter();
+ if (m_tracer != null)
+ flushMyWriter();
// we do not need to handle this.
}
@@ -1130,9 +1141,11 @@
protected void fireStartDoc()
throws org.xml.sax.SAXException
{
- flushMyWriter();
if (m_tracer != null)
-
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_STARTDOCUMENT);
+ {
+ flushMyWriter();
+
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_STARTDOCUMENT);
+ }
}
@@ -1142,9 +1155,11 @@
protected void fireEndDoc()
throws org.xml.sax.SAXException
{
- flushMyWriter();
if (m_tracer != null)
- m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENDDOCUMENT);
+ {
+ flushMyWriter();
+
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENDDOCUMENT);
+ }
}
/**
@@ -1156,11 +1171,13 @@
*/
protected void fireStartElem(String elemName)
throws org.xml.sax.SAXException
- {
- flushMyWriter();
+ {
if (m_tracer != null)
+ {
+ flushMyWriter();
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_STARTELEMENT,
- elemName, m_attributes);
+ elemName, m_attributes);
+ }
}
@@ -1183,9 +1200,12 @@
protected void fireEscapingEvent(String name, String data)
throws org.xml.sax.SAXException
{
- flushMyWriter();
+
if (m_tracer != null)
- m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_PI,name,
data);
+ {
+ flushMyWriter();
+ m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_PI,name,
data);
+ }
}
@@ -1196,9 +1216,11 @@
protected void fireEntityReference(String name)
throws org.xml.sax.SAXException
{
- flushMyWriter();
if (m_tracer != null)
-
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENTITYREF,name,
(Attributes)null);
+ {
+ flushMyWriter();
+
m_tracer.fireGenerateEvent(SerializerTrace.EVENTTYPE_ENTITYREF,name,
(Attributes)null);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
