You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/05/07 07:31:27 UTC
svn commit: r1742689 - in
/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer:
SerializerXmlHandler.java ToStream.java ToXMLStream.java
Author: veithen
Date: Sat May 7 07:31:27 2016
New Revision: 1742689
URL: http://svn.apache.org/viewvc?rev=1742689&view=rev
Log:
Call closeStartTag explicitly.
Modified:
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java?rev=1742689&r1=1742688&r2=1742689&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/SerializerXmlHandler.java Sat May 7 07:31:27 2016
@@ -110,6 +110,7 @@ public class SerializerXmlHandler implem
elementLocalName = null;
elementQName = null;
attributes.clear();
+ serializer.closeStartTag();
}
public void endElement() throws StreamException {
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java?rev=1742689&r1=1742688&r2=1742689&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToStream.java Sat May 7 07:31:27 2016
@@ -1207,11 +1207,6 @@ abstract public class ToStream extends S
try
{
final int old_start = start;
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
m_ispreserve = true;
if (shouldIndent())
@@ -1292,12 +1287,6 @@ abstract public class ToStream extends S
return;
try
{
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
-
m_ispreserve = true;
m_writer.write(ch, start, length);
@@ -1348,12 +1337,7 @@ abstract public class ToStream extends S
m_docIsEmpty = false;
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
- else if (m_needToCallStartDocument)
+ if (m_needToCallStartDocument)
{
startDocumentInternal();
}
@@ -1377,13 +1361,6 @@ abstract public class ToStream extends S
return;
}
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
-
-
try
{
int i;
@@ -1851,15 +1828,6 @@ abstract public class ToStream extends S
m_needToOutputDocTypeDecl = false;
}
- /* before we over-write the current elementLocalName etc.
- * lets close out the old one (if we still need to)
- */
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
-
if (namespaceURI != null)
ensurePrefixIsDeclared(namespaceURI, name);
@@ -2314,12 +2282,7 @@ abstract public class ToStream extends S
int start_old = start;
if (m_inEntityRef)
return;
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
- else if (m_needToCallStartDocument)
+ if (m_needToCallStartDocument)
{
startDocumentInternal();
m_needToCallStartDocument = false;
@@ -2548,6 +2511,8 @@ abstract public class ToStream extends S
m_isprevtext = false;
m_preserves.push(m_ispreserve);
}
+
+ m_elemContext.m_startTagOpen = false;
}
}
@@ -2729,11 +2694,6 @@ abstract public class ToStream extends S
startDocumentInternal();
m_needToCallStartDocument = false;
}
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
if (m_cdataTagOpen)
{
Modified: webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java?rev=1742689&r1=1742688&r2=1742689&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java (original)
+++ webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/stream/serializer/ToXMLStream.java Sat May 7 07:31:27 2016
@@ -265,12 +265,7 @@ public class ToXMLStream extends ToStrea
{
try
{
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
- else if (m_needToCallStartDocument)
+ if (m_needToCallStartDocument)
startDocumentInternal();
if (shouldIndent())
@@ -337,12 +332,6 @@ public class ToXMLStream extends ToStrea
*/
public void entityReference(String name) throws StreamException
{
- if (m_elemContext.m_startTagOpen)
- {
- closeStartTag();
- m_elemContext.m_startTagOpen = false;
- }
-
try
{
if (shouldIndent())