cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1040309 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
Date Mon, 29 Nov 2010 21:35:54 GMT
Author: sergeyb
Date: Mon Nov 29 21:35:53 2010
New Revision: 1040309

URL: http://svn.apache.org/viewvc?rev=1040309&view=rev
Log:
Merged revisions 1040307 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1040307 | sergeyb | 2010-11-29 21:32:39 +0000 (Mon, 29 Nov 2010) | 1 line
  
  Fixing the compilation failure
........

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/utils/ResourceUtils.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 29 21:35:53 2010
@@ -1 +1 @@
-/cxf/trunk:1038206,1038374,1038386,1038722,1038746,1039039,1039197,1039504,1040187
+/cxf/trunk:1038206,1038374,1038386,1038722,1038746,1039039,1039197,1039504,1040187,1040307

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/utils/ResourceUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java?rev=1040309&r1=1040308&r2=1040309&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
Mon Nov 29 21:35:53 2010
@@ -570,7 +570,7 @@ public final class ResourceUtils {
         if (!ignoreAppPath) {
             ApplicationPath appPath = app.getClass().getAnnotation(ApplicationPath.class);
             if (appPath != null) {
-                address = appPath.value().isEmpty() ? "/" : appPath.value();
+                address = appPath.value().length() == 0 ? "/" : appPath.value();
             }
         }
         bean.setAddress(address);



Mime
View raw message