svn commit: r1154152 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisJSONProvider.java

[sergeyb]

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<T> 
         // 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);
     }