svn commit: r1630556 - /tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java

[rmannibucau]

Author: rmannibucau
Date: Thu Oct  9 19:00:25 2014
New Revision: 1630556

URL: http://svn.apache.org/r1630556
Log:
better matching of context (handling '' and '/xxx')

Modified:
    
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java

Modified: 
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java?rev=1630556&r1=1630555&r2=1630556&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/internal/StandardContextCustomizer.java
 Thu Oct  9 19:00:25 2014
@@ -48,7 +48,11 @@ public class StandardContextCustomizer {
         }
 
         final StandardContext context = StandardContext.class.cast(data);
-        if (!module.getContextRoot().equals(context.getPath())) {
+        final String contextRoot = module.getContextRoot();
+        final String path = context.getPath();
+        final boolean rightPath = (path.isEmpty() && contextRoot.equals(path))
+                || (contextRoot.startsWith("/") ? contextRoot : '/' + 
contextRoot).equals(path);
+        if (!rightPath) {
             return;
         }