cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1469790 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
Date Fri, 19 Apr 2013 11:42:53 GMT
Author: sergeyb
Date: Fri Apr 19 11:42:53 2013
New Revision: 1469790

URL: http://svn.apache.org/r1469790
Log:
Merged revisions 1469786 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1469786 | sergeyb | 2013-04-19 12:37:36 +0100 (Fri, 19 Apr 2013) | 9 lines
  
  Merged revisions 1469785 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1469785 | sergeyb | 2013-04-19 12:34:23 +0100 (Fri, 19 Apr 2013) | 1 line
    
    [CXF-4975] Appending a forward slash to Application path if needed
  ........
................

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1469786
  Merged /cxf/trunk:r1469785

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

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java?rev=1469790&r1=1469789&r2=1469790&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
Fri Apr 19 11:42:53 2013
@@ -665,9 +665,12 @@ public final class ResourceUtils {
         if (!ignoreAppPath) {
             ApplicationPath appPath = app.getClass().getAnnotation(ApplicationPath.class);
             if (appPath != null) {
-                address = appPath.value().length() == 0 ? "/" : appPath.value();
+                address = appPath.value();
             }
         }
+        if (!address.startsWith("/")) {
+            address = "/" + address;
+        }
         bean.setAddress(address);
         bean.setStaticSubresourceResolution(staticSubresourceResolution);
         bean.setResourceClasses(resourceClasses);



Mime
View raw message