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 2011/10/16 10:24:12 UTC
svn commit: r1184781 - in /webservices/axiom/branches/AXIOM-201: ./
modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/
modules/axiom-tests/src/test/java/org/apache/axiom/soap/
modules/axiom-testsuite/src/main/java/org/apache/axiom...
Author: veithen
Date: Sun Oct 16 08:24:11 2011
New Revision: 1184781
URL: http://svn.apache.org/viewvc?rev=1184781&view=rev
Log:
Merged changes from trunk.
Added:
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuilt.java
- copied unchanged from r1184779, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithoutCachingPartiallyBuilt.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumePartiallyBuilt.java
- copied unchanged from r1184779, webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerializeAndConsumePartiallyBuilt.java
Removed:
webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPEnvelopeBuildTest.java
Modified:
webservices/axiom/branches/AXIOM-201/ (props changed)
webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/OMTestSuiteBuilder.java
Propchange: webservices/axiom/branches/AXIOM-201/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 16 08:24:11 2011
@@ -1,2 +1,2 @@
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/commons/trunk/modules/axiom:1183599-1183625
+/webservices/commons/trunk/modules/axiom:1183599-1184779
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java?rev=1184781&r1=1184780&r2=1184781&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Sun Oct 16 08:24:11 2011
@@ -1083,6 +1083,11 @@ class SwitchingWrapper extends AbstractX
/** Method updateCompleteStatus. */
private void updateCompleteStatus() {
+ if (currentEvent == START_ELEMENT) {
+ depth++;
+ } else if (currentEvent == END_ELEMENT) {
+ depth--;
+ }
if (state == NAVIGABLE) {
if (rootNode == currentNode) {
if (isFirst) {
@@ -1094,20 +1099,8 @@ class SwitchingWrapper extends AbstractX
}
}
} else {
- if (state == SWITCHED && rootNode instanceof OMElement) {
- //this is a potential place for bugs
- //we have to test if the root node of this parser
- //has the same name for this test
- if (currentEvent == START_ELEMENT &&
- (parser.getLocalName().equals(((OMElement)rootNode).getLocalName()))) {
- ++depth;
- } else if (currentEvent == END_ELEMENT &&
- (parser.getLocalName().equals(((OMElement)rootNode).getLocalName())) ) {
- --depth;
- if (depth < 0) {
- state = COMPLETED;
- }
- }
+ if (state == SWITCHED && currentEvent == END_ELEMENT && depth == 0 && rootNode instanceof OMElement) {
+ state = COMPLETED;
}
state = (currentEvent == END_DOCUMENT)
? DOCUMENT_COMPLETE
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/OMTestSuiteBuilder.java?rev=1184781&r1=1184780&r2=1184781&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/OMTestSuiteBuilder.java Sun Oct 16 08:24:11 2011
@@ -167,6 +167,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElement(metaFactory, true));
addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElement(metaFactory, false));
addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithOMSourcedElementDescendant(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithoutCachingPartiallyBuilt(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestIsCompleteAfterAddingIncompleteChild(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestMultipleDefaultNS(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestResolveQNameWithDefaultNamespace(metaFactory));
@@ -192,6 +193,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.element.TestSerialization(metaFactory, "U", "D",
"<person><name xmlns=\"urn:ns\">John</name><age xmlns=\"urn:ns\">34</age><weight xmlns=\"urn:ns\">50</weight></person>"));
addTest(new org.apache.axiom.ts.om.element.TestSerializationWithTwoNonBuiltOMElements(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestSerializeAndConsumePartiallyBuilt(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestSerializeAndConsumeWithIncompleteDescendant(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestSetNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestSetNamespaceInvalid(metaFactory));