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 E75697C4F for ; Fri, 5 Aug 2011 09:52:41 +0000 (UTC) Received: (qmail 13513 invoked by uid 500); 5 Aug 2011 09:52:40 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 13455 invoked by uid 500); 5 Aug 2011 09:52:34 -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 13433 invoked by uid 99); 5 Aug 2011 09:52:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2011 09:52:32 +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; Fri, 05 Aug 2011 09:52:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EFC8223888CE for ; Fri, 5 Aug 2011 09:52:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1154152 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisJSONProvider.java Date: Fri, 05 Aug 2011 09:52:08 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110805095208.EFC8223888CE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Aug 5 09:52:08 2011 New Revision: 1154152 URL: http://svn.apache.org/viewvc?rev=1154152&view=rev Log: Merged revisions 1154149 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1154149 | sergeyb | 2011-08-05 10:50:08 +0100 (Fri, 05 Aug 2011) | 1 line [CXF-3704] Minor fix to AegisJSONProvider ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisJSONProvider.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 5 09:52:08 2011 @@ -1 +1 @@ -/cxf/trunk:1154143 +/cxf/trunk:1154143,1154149 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisJSONProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisJSONProvider.java?rev=1154152&r1=1154151&r2=1154152&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisJSONProvider.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisJSONProvider.java Fri Aug 5 09:52:08 2011 @@ -139,7 +139,7 @@ public final class AegisJSONProvider // the namespace map. Oh, the namespace map. // This is wrong, but might make unit tests pass until we redesign. if (typeToRead != null) { - namespaceMap.put(typeToRead.getSchemaType().getNamespaceURI(), "ns1"); + namespaceMap.putIfAbsent(typeToRead.getSchemaType().getNamespaceURI(), "ns1"); } return JSONUtils.createStreamReader(is, readXsiType, namespaceMap); }