svn commit: r1706498 - in /webservices/axiom/trunk/aspects: core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomDocumentSupport.aj

[veithen]

Author: veithen
Date: Fri Oct  2 22:23:13 2015
New Revision: 1706498

URL: http://svn.apache.org/viewvc?rev=1706498&view=rev
Log:
Fix some regressions.

Modified:
    
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
    
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomDocumentSupport.aj

Modified: 
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj?rev=1706498&r1=1706497&r2=1706498&view=diff
==============================================================================
--- 
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
 (original)
+++ 
webservices/axiom/trunk/aspects/core-aspects/src/main/java/org/apache/axiom/core/CoreChildNodeSupport.aj
 Fri Oct  2 22:23:13 2015
@@ -207,14 +207,14 @@ public aspect CoreChildNodeSupport {
                 parent.getContent(true).firstChild = nextSibling;
             } else {
                 previousSibling.nextSibling = nextSibling;
-                previousSibling = null;
             }
             if (nextSibling == null) {
                 parent.getContent(true).lastChild = previousSibling;
             } else {
                 nextSibling.previousSibling = previousSibling;
-                nextSibling = null;
             }
+            nextSibling = null;
+            previousSibling = null;
             if (newParent == null) {
                 internalUnsetParent(detachPolicy.getNewOwnerDocument(parent));
             }

Modified: 
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomDocumentSupport.aj
URL: 
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomDocumentSupport.aj?rev=1706498&r1=1706497&r2=1706498&view=diff
==============================================================================
--- 
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomDocumentSupport.aj
 (original)
+++ 
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomDocumentSupport.aj
 Fri Oct  2 22:23:13 2015
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMOutputForma
 import org.apache.axiom.om.impl.common.serializer.push.OutputException;
 import org.apache.axiom.om.impl.common.serializer.push.Serializer;
 import org.apache.axiom.om.impl.intf.AxiomDocument;
+import org.apache.axiom.om.impl.intf.AxiomElement;
 
 public aspect AxiomDocumentSupport {
     public final OMElement AxiomDocument.getOMDocumentElement() {
@@ -35,17 +36,11 @@ public aspect AxiomDocumentSupport {
         if (documentElement == null) {
             throw new IllegalArgumentException("documentElement must not be 
null");
         }
-        OMElement existingDocumentElement = getOMDocumentElement();
+        AxiomElement existingDocumentElement = 
(AxiomElement)coreGetDocumentElement();
         if (existingDocumentElement == null) {
             addChild(documentElement);
         } else {
-            OMNode nextSibling = existingDocumentElement.getNextOMSibling();
-            existingDocumentElement.detach();
-            if (nextSibling == null) {
-                addChild(documentElement);
-            } else {
-                nextSibling.insertSiblingBefore(documentElement);
-            }
+            
existingDocumentElement.coreReplaceWith((AxiomElement)documentElement, 
Policies.DETACH_POLICY);
         }
     }