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/01/16 23:54:48 UTC
svn commit: r1725046 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
Author: veithen
Date: Sat Jan 16 22:54:48 2016
New Revision: 1725046
URL: http://svn.apache.org/viewvc?rev=1725046&view=rev
Log:
Fix some TODO items.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj?rev=1725046&r1=1725045&r2=1725046&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomContainerSupport.aj Sat Jan 16 22:54:48 2016
@@ -291,8 +291,6 @@ public aspect AxiomContainerSupport {
} catch (OutputException ex) {
throw (XMLStreamException)ex.getCause();
}
- // TODO: the flush is necessary because of an issue with the lifecycle of MTOMXMLStreamWriter
- writer.flush();
} finally {
writer.close();
}
@@ -308,8 +306,6 @@ public aspect AxiomContainerSupport {
} catch (OutputException ex) {
throw (XMLStreamException)ex.getCause();
}
- // TODO: the flush is necessary because of an issue with the lifecycle of MTOMXMLStreamWriter
- writer.flush();
} finally {
writer.close();
}
@@ -324,8 +320,6 @@ public aspect AxiomContainerSupport {
} catch (OutputException ex) {
throw (XMLStreamException)ex.getCause();
}
- // TODO: the flush is necessary because of an issue with the lifecycle of MTOMXMLStreamWriter
- writer.flush();
} finally {
writer.close();
}
@@ -342,8 +336,6 @@ public aspect AxiomContainerSupport {
} catch (OutputException ex) {
throw (XMLStreamException)ex.getCause();
}
- // TODO: the flush is necessary because of an issue with the lifecycle of MTOMXMLStreamWriter
- writer.flush();
} finally {
writer.close();
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java?rev=1725046&r1=1725045&r2=1725046&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java Sat Jan 16 22:54:48 2016
@@ -216,12 +216,11 @@ public class MTOMXMLStreamWriter impleme
}
public void close() throws XMLStreamException {
- // TODO: we should probably call flush if the attachments have not been written yet
log.debug("close");
// Only call flush because data may have been written to the underlying output stream
// without ever calling writeStartElement. In this case, close would trigger an
// exception.
- xmlWriter.flush();
+ flush();
}
/**