Author: dims Date: Fri Mar 28 07:47:08 2008 New Revision: 642246 URL: http://svn.apache.org/viewvc?rev=642246&view=rev Log: Revert change made in: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java?r1=642096&r2=642095&pathrev=642096
Which is part of: http://svn.apache.org/viewvc?view=rev&revision=642096 As it breaks Axis2/SAAJ: ------------------------------------------------------------------------------ Tests run: 24, Failures: 15, Errors: 9, Skipped: 0, Time elapsed: 0.072 sec <<< FAILURE! testAddDetailsTwice(org.apache.axis2.saaj.SOAPFaultTest) Time elapsed: 0.006 sec <<< ERROR! org.apache.axiom.om.OMException: Parent level elements cannot be detached at org.apache.axiom.om.impl.dom.ChildNode.detach(ChildNode.java:116) at org.apache.axiom.om.impl.dom.ElementImpl.discard(ElementImpl.java:1349) at org.apache.axiom.soap.impl.dom.SOAPFaultImpl.setNewElement(SOAPFaultImpl.java:148) at org.apache.axiom.soap.impl.dom.SOAPFaultImpl.setCode(SOAPFaultImpl.java:91) at org.apache.axiom.soap.impl.dom.soap11.SOAP11FaultImpl.setCode(SOAP11FaultImpl.java:73) at org.apache.axis2.saaj.SOAPFaultImpl.setFaultCode(SOAPFaultImpl.java:733) at org.apache.axis2.saaj.SOAPFaultImpl.setDefaults(SOAPFaultImpl.java:77) at org.apache.axis2.saaj.SOAPBodyImpl.addFault(SOAPBodyImpl.java:193) at org.apache.axis2.saaj.SOAPFaultTest.testAddDetailsTwice(SOAPFaultTest.java:169) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:45) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:599) at junit.framework.TestCase.runTest(TestCase.java:168) at junit.framework.TestCase.runBare(TestCase.java:134) at junit.framework.TestResult$1.protect(TestResult.java:110) at junit.framework.TestResult.runProtected(TestResult.java:128) at junit.framework.TestResult.run(TestResult.java:113) at junit.framework.TestCase.run(TestCase.java:124) at junit.framework.TestSuite.runTest(TestSuite.java:232) Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java?rev=642246&r1=642245&r2=642246&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ChildNode.java Fri Mar 28 07:47:08 2008 @@ -89,12 +89,7 @@ } public OMContainer getParent() throws OMException { - if(parentNode != null) { - return this.parentNode; - } else { - //This is the case where this child is the document element - return this.ownerNode; - } + return this.parentNode; } public Node getParentNode() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
