Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-05-29 20:22:25 -0400
committerGreg Wilkins2013-05-29 20:22:25 -0400
commit94e669afaee00939da45261097607c81c29375a3 (patch)
treeb8c68092b74e250b03bb915d5609a9beb3c5ea22
parentc961d656979a677a685715b8b4eeef39f3d8a3a9 (diff)
parent3d553e79a9504a3387e9060ae9dde01e1370b892 (diff)
downloadorg.eclipse.jetty.project-94e669afaee00939da45261097607c81c29375a3.tar.gz
org.eclipse.jetty.project-94e669afaee00939da45261097607c81c29375a3.tar.xz
org.eclipse.jetty.project-94e669afaee00939da45261097607c81c29375a3.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
-rw-r--r--jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
index 1fa1c1eb6b..2986c7467c 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
@@ -1165,7 +1165,8 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
String welcome = indexNode.toString(false, true);
//Servlet Spec 3.0 p. 74 welcome files are additive
- context.setWelcomeFiles((String[])ArrayUtil.addToArray(context.getWelcomeFiles(),welcome,String.class));
+ if (welcome != null && welcome.trim().length() > 0)
+ context.setWelcomeFiles((String[])ArrayUtil.addToArray(context.getWelcomeFiles(),welcome,String.class));
}
}

Back to the top