You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/02/20 15:45:04 UTC
svn commit: r1661133 -
/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
Author: cziegeler
Date: Fri Feb 20 14:45:04 2015
New Revision: 1661133
URL: http://svn.apache.org/r1661133
Log:
FELIX-4060 : Fix registration of servlets and resources at /
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java?rev=1661133&r1=1661132&r2=1661133&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/ServletInfo.java Fri Feb 20 14:45:04 2015
@@ -108,7 +108,14 @@ public final class ServletInfo extends W
{
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;