Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1233313 - in /cxf/branches/2.3.x-fixes: ./
 rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Date: Thu, 19 Jan 2012 12:21:15 -0000
To: commits@cxf.apache.org
From: sergeyb@apache.org
Message-Id: <20120119122115.BEB2823889C5@eris.apache.org>

Author: sergeyb
Date: Thu Jan 19 12:21:15 2012
New Revision: 1233313

URL: http://svn.apache.org/viewvc?rev=1233313&view=rev
Log:
Merged revisions 1233312 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1233312 | sergeyb | 2012-01-19 12:20:12 +0000 (Thu, 19 Jan 2012) | 16 lines
  
  Merged revisions 1233311 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1233311 | sergeyb | 2012-01-19 12:19:24 +0000 (Thu, 19 Jan 2012) | 9 lines
    
    Merged revisions 1233308 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1233308 | sergeyb | 2012-01-19 12:17:13 +0000 (Thu, 19 Jan 2012) | 1 line
      
      Fixing the compilation failure, sorry for the noise
    ........
  ................
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 12:21:15 2012
@@ -1,3 +1,3 @@
-/cxf/branches/2.4.x-fixes:1232881,1233114,1233299
-/cxf/branches/2.5.x-fixes:1232880,1233113,1233296
-/cxf/trunk:1232877,1233112,1233289-1233294
+/cxf/branches/2.4.x-fixes:1232881,1233114,1233299,1233312
+/cxf/branches/2.5.x-fixes:1232880,1233113,1233296,1233311
+/cxf/trunk:1232877,1233112,1233289-1233294,1233308

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

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=1233313&r1=1233312&r2=1233313&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Thu Jan 19 12:21:15 2012
@@ -349,7 +349,7 @@ public class JSONProvider extends Abstra
             if (!ignoreNamespaces) {
                 if (namespaceMap.containsKey(qname.getNamespaceURI())) {
                     prefix = namespaceMap.get(qname.getNamespaceURI());
-                    if (!prefix.isEmpty()) {
+                    if (prefix.length() > 0) {
                         prefix += ".";
                     }
                 } else if (qname.getNamespaceURI().length() > 0) {