You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/01/19 13:19:25 UTC
svn commit: r1233311 - in /cxf/branches/2.5.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Author: sergeyb
Date: Thu Jan 19 12:19:24 2012
New Revision: 1233311
URL: http://svn.apache.org/viewvc?rev=1233311&view=rev
Log:
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.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 12:19:24 2012
@@ -1 +1 @@
-/cxf/trunk:1233075,1233112,1233289-1233294
+/cxf/trunk:1233075,1233112,1233289-1233294,1233308
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=1233311&r1=1233310&r2=1233311&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java Thu Jan 19 12:19:24 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) {