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/01/30 22:59:06 UTC
svn commit: r1727759 - in /webservices/axiom/branches/1.2.x: ./
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java
Author: veithen
Date: Sat Jan 30 21:59:05 2016
New Revision: 1727759
URL: http://svn.apache.org/viewvc?rev=1727759&view=rev
Log:
Merge r1727758 to the 1.2 branch.
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/factory/DOMNamespaceContext.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 30 21:59:05 2016
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755
+/webservices/axiom/trunk:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758
Modified: webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.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/factory/DOMNamespaceContext.java?rev=1727759&r1=1727758&r2=1727759&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java (original)
+++ webservices/axiom/branches/1.2.x/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DOMNamespaceContext.java Sat Jan 30 21:59:05 2016
@@ -40,7 +40,7 @@ class DOMNamespaceContext extends Abstra
}
protected String doGetPrefix(String namespaceURI) {
- Set seenPrefixes = new HashSet();
+ Set<String> seenPrefixes = new HashSet<String>();
Node current = reader.currentNode();
do {
NamedNodeMap attributes = current.getAttributes();
@@ -66,8 +66,8 @@ class DOMNamespaceContext extends Abstra
protected Iterator doGetPrefixes(String namespaceURI) {
// seenPrefixes tracks all prefixes we have encountered; this is important to
// handle prefixes that are overridden by descendant elements
- Set seenPrefixes = new HashSet();
- Set matchingPrefixes = new HashSet();
+ Set<String> seenPrefixes = new HashSet<String>();
+ Set<String> matchingPrefixes = new HashSet<String>();
Node current = reader.currentNode();
do {
NamedNodeMap attributes = current.getAttributes();