cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1233312 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Date Thu, 19 Jan 2012 12:20:13 GMT
Author: sergeyb
Date: Thu Jan 19 12:20:12 2012
New Revision: 1233312

URL: http://svn.apache.org/viewvc?rev=1233312&view=rev
Log:
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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 12:20:12 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1233076,1233113,1233296
-/cxf/trunk:1233075,1233112,1233289-1233294
+/cxf/branches/2.5.x-fixes:1233076,1233113,1233296,1233311
+/cxf/trunk:1233075,1233112,1233289-1233294,1233308

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/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=1233312&r1=1233311&r2=1233312&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Thu Jan 19 12:20:12 2012
@@ -394,7 +394,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) {



Mime
View raw message