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

[rmannibucau]

Author: rmannibucau
Date: Tue Jan  1 17:21:15 2013
New Revision: 1427479

URL: http://svn.apache.org/viewvc?rev=1427479&view=rev
Log:
ROOT app needs some check regarding address building

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=1427479&r1=1427478&r2=1427479&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
 Tue Jan  1 17:21:15 2013
@@ -312,7 +312,14 @@ public abstract class RESTService implem
             configuration = PojoUtil.findConfiguration(pojoConfigurations, 
contextRoot);
         }
 
-        final String nopath = getAddress(contextRoot) + prefix;
+        final String base = getAddress(contextRoot);
+        final String nopath;
+        if (base.endsWith("/") && prefix.startsWith("/")) {
+            nopath = base + prefix.substring(1);
+        } else {
+            nopath = base + prefix;
+        }
+
         final RsHttpListener listener = createHttpListener();
         final RsRegistry.AddressInfo address = 
rsRegistry.createRsHttpListener(contextRoot, listener, classLoader, 
nopath.substring(NOPATH_PREFIX.length() - 1), virtualHost);