svn commit: r1461885 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java

[ay]

Author: ay
Date: Wed Mar 27 22:44:18 2013
New Revision: 1461885

URL: http://svn.apache.org/r1461885
Log:
Merged revisions 1461881 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1461881 | ay | 2013-03-27 23:21:05 +0100 (Wed, 27 Mar 2013) | 9 lines
  
  Merged revisions 1461878 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1461878 | ay | 2013-03-27 23:17:19 +0100 (Wed, 27 Mar 2013) | 1 line
    
    remove the unnecessary put op
  ........
  
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java

Propchange: cxf/branches/2.6.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java?rev=1461885&r1=1461884&r2=1461885&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
 Wed Mar 27 22:44:18 2013
@@ -80,7 +80,9 @@ class DelegatingNamespaceContext impleme
             for (Map<String, String> nss : namespaces) {
                 String ns = nss.get(prefix);
                 if (ns != null) {
-                    cache.put(prefix, ns);
+                    if (cache != nss) {
+                        cache.put(prefix, ns);
+                    }
                     return ns;
                 }
             }
@@ -114,7 +116,9 @@ class DelegatingNamespaceContext impleme
             for (Map<String, String> pfs : prefixes) {
                 String prefix = pfs.get(ns);
                 if (prefix != null && ns.equals(getNamespaceURI(prefix))) {
-                    cache.put(ns, prefix);
+                    if (pfs != cache) {
+                        cache.put(ns, prefix);
+                    }
                     return prefix;
                 }
             }