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 23:48:53 UTC
svn commit: r1727762 - in /webservices/axiom/branches/1.2.x: ./
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
Author: veithen
Date: Sat Jan 30 22:48:53 2016
New Revision: 1727762
URL: http://svn.apache.org/viewvc?rev=1727762&view=rev
Log:
Merge r1727761 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/serializer/pull/Navigator.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 30 22:48:53 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,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761
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=1727762&r1=1727761&r2=1727762&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 Sat Jan 30 22:48:53 2016
@@ -847,9 +847,9 @@ final class Navigator extends PullSerial
* ####################################################################
*/
- private Map getAllNamespaces(OMSerializable contextNode) {
+ private Map<String,String> getAllNamespaces(OMSerializable contextNode) {
if (contextNode == null) {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
}
OMContainer context;
if (contextNode instanceof OMContainer) {
@@ -857,7 +857,7 @@ final class Navigator extends PullSerial
} else {
context = ((OMNode)contextNode).getParent();
}
- Map nsMap = new LinkedHashMap();
+ Map<String,String> nsMap = new LinkedHashMap<String,String>();
while (context != null && !(context instanceof OMDocument)) {
OMElement element = (OMElement) context;
for (Iterator it = element.getAllDeclaredNamespaces(); it.hasNext(); ) {
@@ -877,7 +877,7 @@ final class Navigator extends PullSerial
return nsMap;
}
- private void addNamespaceToMap(OMNamespace ns, Map map) {
+ private void addNamespaceToMap(OMNamespace ns, Map<String,String> map) {
if (map.get(ns.getPrefix()) == null) {
map.put(ns.getPrefix(), ns.getNamespaceURI());
}