Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E670F3CF for ; Wed, 27 Mar 2013 22:48:54 +0000 (UTC) Received: (qmail 87516 invoked by uid 500); 27 Mar 2013 22:48:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87413 invoked by uid 500); 27 Mar 2013 22:48:54 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 87405 invoked by uid 99); 27 Mar 2013 22:48:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Mar 2013 22:48:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Mar 2013 22:48:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 26D892388906; Wed, 27 Mar 2013 22:48:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1461888 - in /cxf/branches/2.5.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java Date: Wed, 27 Mar 2013 22:48:33 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130327224833.26D892388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Wed Mar 27 22:48:32 2013 New Revision: 1461888 URL: http://svn.apache.org/r1461888 Log: Merged revisions 1461885 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1461885 | ay | 2013-03-27 23:44:18 +0100 (Wed, 27 Mar 2013) | 17 lines 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.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java Propchange: cxf/branches/2.5.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java?rev=1461888&r1=1461887&r2=1461888&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java (original) +++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java Wed Mar 27 22:48:32 2013 @@ -80,7 +80,9 @@ class DelegatingNamespaceContext impleme for (Map 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 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; } }