WFLY-5756 Unable to exclude root context (/) via excluded-contexts in…

… mod_cluster subsystem
wildfly · Dec 2, 2015 · 576e71f · 576e71f
1 parent 1ed22f0
commit 576e71f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowContext.java b/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowContext.java
@@ -59,7 +59,8 @@ public Host getHost() {
 
     @Override
     public String getPath() {
-        return this.deployment.getDeploymentInfo().getContextPath();
+        String path = this.deployment.getDeploymentInfo().getContextPath();
+        return "/".equals(path) ? "" : path;
     }
 
     @Override

diff --git a/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowHost.java b/mod_cluster/undertow/src/main/java/org/wildfly/mod_cluster/undertow/UndertowHost.java
@@ -93,8 +93,10 @@ public Set<String> getAliases() {
 
     @Override
     public Context findContext(String path) {
+        String findPath = "".equals(path) ? "/" : path;
+
         for (Deployment deployment : this.host.getDeployments()) {
-            if (deployment.getDeploymentInfo().getContextPath().equals(path)) {
+            if (deployment.getDeploymentInfo().getContextPath().equals(findPath)) {
                 return new UndertowContext(deployment, this);
             }
         }

diff --git a/...ster/undertow/src/test/java/org/wildfly/mod_cluster/undertow/UndertowContextTestCase.java b/...ster/undertow/src/test/java/org/wildfly/mod_cluster/undertow/UndertowContextTestCase.java
@@ -58,7 +58,7 @@ public void getHost() {
     @Test
     public void getPath() {
         DeploymentInfo info = new DeploymentInfo();
-        String expected = "/";
+        String expected = "";
         info.setContextPath(expected);
 
         when(this.deployment.getDeploymentInfo()).thenReturn(info);

diff --git a/...cluster/undertow/src/test/java/org/wildfly/mod_cluster/undertow/UndertowHostTestCase.java b/...cluster/undertow/src/test/java/org/wildfly/mod_cluster/undertow/UndertowHostTestCase.java
@@ -68,7 +68,7 @@ public void getEngine() {
     public void getContexts() {
         Deployment deployment = mock(Deployment.class);
         DeploymentInfo info = new DeploymentInfo();
-        String expectedPath = "/";
+        String expectedPath = "";
         info.setContextPath(expectedPath);
         HttpHandler handler = mock(HttpHandler.class);
 
@@ -89,7 +89,7 @@ public void getContexts() {
     public void findContext() {
         Deployment deployment = mock(Deployment.class);
         DeploymentInfo info = new DeploymentInfo();
-        String expectedPath = "/";
+        String expectedPath = "";
         info.setContextPath(expectedPath);
         HttpHandler handler = mock(HttpHandler.class);