commit f9460deffd6e35511848f19c3dd6ea9669472401
author Carsten Ziegeler <cziegeler@apache.org> Fri Feb 20 14:45:04 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Fri Feb 20 14:45:04 2015 +0000
tree 820cdfaeb470f79178680aad99a8a1847fd2d9e1
parent a812cc18b010f55b38e6a7f5809670fca6866d01

FELIX-4060 : Fix registration of servlets and resources at /

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1661133 13f79535-47bb-0310-9956-ffa450edef68

http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java

diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
index c24871a..f0f0404 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
@@ -108,7 +108,14 @@
     {
         super(serviceRanking);
         this.name = name;
-        this.patterns = new String[] {pattern, pattern + "/*"};
+        if ( pattern.equals("/") )
+        {
+            this.patterns = new String[] {"/", "/*"};
+        }
+        else
+        {
+            this.patterns = new String[] {pattern, pattern + "/*"};
+        }
         this.initParams = initParams;
         this.asyncSupported = false;
         this.errorPage = null;