svn commit: r1384607 - /openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java

[rmannibucau]

Author: rmannibucau
Date: Fri Sep 14 00:16:13 2012
New Revision: 1384607

URL: http://svn.apache.org/viewvc?rev=1384607&view=rev
Log:
minor string fix for rest paths (we should refactor the way we manage suburl 
etc in rest logic to avoid such issues - adding a PathHelper can help))

Modified:
    
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java

Modified: 
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1384607&r1=1384606&r2=1384607&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
 Fri Sep 14 00:16:13 2012
@@ -369,31 +369,32 @@ public abstract class RESTService implem
         // context can get the app path too
         // so keep only web context without /
         String webCtx = context;
-        if (webCtx.startsWith("/")) {
+        while (webCtx.startsWith("/")) {
             webCtx = webCtx.substring(1);
         }
 
         // get root path ending with /
-        String base;
         try {
             final URL url = new URL(address);
             final int port = url.getPort();
             if (port > 0) {
-                return base = url.getProtocol() + "://" + url.getHost() + ":" 
+ port + "/" + webCtx;
+                return url.getProtocol() + "://" + url.getHost() + ":" + port 
+ "/" + webCtx;
             } else {
-                base = url.getProtocol() + "://" + url.getHost() + "/" + 
webCtx;
+                return url.getProtocol() + "://" + url.getHost() + "/" + 
webCtx;
             }
         } catch (MalformedURLException e) {
             throw new OpenEJBRestRuntimeException("bad url: " + address, e);
         }
-
-        return base + webCtx;
     }
 
     private String getAddress(String context, Class<?> clazz) {
         String root = NOPATH_PREFIX;
         if (context != null) {
-            root += context;
+            if (context.startsWith("/")) {
+                root += context.substring(1);
+            } else {
+                root += context;
+            }
         }
 
         Class<?> usedClass = clazz;
@@ -420,7 +421,7 @@ public abstract class RESTService implem
                 if (path != null) {
                     String classPath = path.value();
                     if (classPath.startsWith("/")) {
-                        classPath = classPath.replaceFirst("/", "");
+                        classPath = classPath.substring(1);
                     }
                     if (!root.endsWith("/")) {
                         root = root + "/";