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/02/17 23:52:59 UTC
svn commit: r1730965 -
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
Author: veithen
Date: Wed Feb 17 22:52:59 2016
New Revision: 1730965
URL: http://svn.apache.org/viewvc?rev=1730965&view=rev
Log:
Code simplification.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj?rev=1730965&r1=1730964&r2=1730965&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomSourcedElementSupport.aj Wed Feb 17 22:52:59 2016
@@ -408,16 +408,12 @@ public aspect AxiomSourcedElementSupport
throws StreamException {
if (isExpanded()) {
defaultInternalSerialize(handler, format, cache);
- } else if (cache) {
- if (OMDataSourceUtil.isDestructiveWrite(dataSource)) {
- forceExpand();
- defaultInternalSerialize(handler, format, true);
- } else {
- // TODO: the serializer ignores namespaceURI and localName
- handler.processOMDataSource(null, null, dataSource);
- }
+ } else if (cache&& OMDataSourceUtil.isDestructiveWrite(dataSource)) {
+ forceExpand();
+ defaultInternalSerialize(handler, format, true);
} else {
- handler.processOMDataSource(null, null, dataSource);
+ // TODO: the serializer ignores namespaceURI and localName
+ handler.processOMDataSource(null, null, dataSource);
}
}