ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1758118 - in /webservices/axiom/branches/1.2.x: ./ aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/ testing/ testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/ testing/axiom-testsuite/src/main/ja...
Date Sun, 28 Aug 2016 14:27:38 GMT
Author: veithen
Date: Sun Aug 28 14:27:38 2016
New Revision: 1758118

URL: http://svn.apache.org/viewvc?rev=1758118&view=rev
Log:
AXIOM-485: Merge the regression test (r1758113) to the 1.2 branch and fix a bug in Navigator.loadNamespaces.

Added:
    webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext2.java
      - copied unchanged from r1758113, webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext2.java
    webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/element/AXIOM-485.xml
      - copied unchanged from r1758113, webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/element/AXIOM-485.xml
Modified:
    webservices/axiom/branches/1.2.x/   (props changed)
    webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
    webservices/axiom/branches/1.2.x/testing/   (props changed)
    webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java

Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 28 14:27:38 2016
@@ -14,4 +14,4 @@
 /webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
 /webservices/axiom/branches/namespaceURIInterning:1293148-1293587
 /webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113

Modified: webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1758118&r1=1758117&r2=1758118&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
(original)
+++ webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Sun Aug 28 14:27:38 2016
@@ -348,16 +348,20 @@ final class Navigator extends PullSerial
                     if (parent instanceof CoreElement) {
                         element = (CoreElement)parent;
                         attr = element.coreGetFirstAttribute();
-                        decl: while (attr != null) {
+                        while (attr != null) {
                             if (attr instanceof CoreNamespaceDeclaration) {
                                 CoreNamespaceDeclaration ns = (CoreNamespaceDeclaration)attr;
                                 String prefix = ns.coreGetDeclaredPrefix();
+                                boolean masked = false;
                                 for (int i=0; i<namespaceCount; i++) {
                                     if (namespaces[i].coreGetDeclaredPrefix().equals(prefix))
{
-                                        continue decl;
+                                        masked = true;
+                                        break;
                                     }
                                 }
-                                addNamespace(ns);
+                                if (!masked) {
+                                    addNamespace(ns);
+                                }
                             }
                             attr = attr.coreGetNextAttribute();
                         }

Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 28 14:27:38 2016
@@ -12,4 +12,4 @@
 /webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
 /webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
 /webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113

Modified: webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1758118&r1=1758117&r2=1758118&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
(original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
Sun Aug 28 14:27:38 2016
@@ -353,6 +353,7 @@ public class OMTestSuiteBuilder extends
         addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithPreserveNamespaceContext(metaFactory,
true, false));
         addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithPreserveNamespaceContext(metaFactory,
false, true));
         addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithPreserveNamespaceContext(metaFactory,
false, false));
+        addTest(new org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithPreserveNamespaceContext2(metaFactory));
         addTest(new org.apache.axiom.ts.om.element.TestHasNameWithNamespace(metaFactory));
         addTest(new org.apache.axiom.ts.om.element.TestHasNameWithoutNamespace(metaFactory));
         addTest(new org.apache.axiom.ts.om.element.TestIsCompleteAfterAddingIncompleteChild(metaFactory));



Mime
View raw message