Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2014-07-11 04:16:24 +0000
committerJan Bartel2014-07-11 04:16:24 +0000
commit644eccab8b600665a611b33be136025ba3aafde6 (patch)
tree55157a0da6a2719e3445e1bc7a415f00bd518183 /jetty-quickstart
parentc674c410031fdcc19aea67e9375f9ecfae1b4f67 (diff)
downloadorg.eclipse.jetty.project-644eccab8b600665a611b33be136025ba3aafde6.tar.gz
org.eclipse.jetty.project-644eccab8b600665a611b33be136025ba3aafde6.tar.xz
org.eclipse.jetty.project-644eccab8b600665a611b33be136025ba3aafde6.zip
439387 Ensure empty servlet-class never generated for quickstart
Diffstat (limited to 'jetty-quickstart')
-rw-r--r--jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
index 27cbf1bb4f..50da724c60 100644
--- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
+++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
@@ -567,8 +567,9 @@ public class QuickStartDescriptorGenerator
out.tag(tag + "-name",n);
String ot = n + "." + tag + ".";
-
- out.tag(tag + "-class",origin(md,ot + tag + "-class"),holder.getClassName());
+
+ if (holder instanceof FilterHolder)
+ out.tag(tag + "-class",origin(md,ot + tag + "-class"),holder.getClassName());
for (String p : holder.getInitParameters().keySet())
{
@@ -583,8 +584,10 @@ public class QuickStartDescriptorGenerator
if (holder instanceof ServletHolder)
{
ServletHolder s = (ServletHolder)holder;
- if (s.getForcedPath() != null)
+ if (s.getForcedPath() != null && s.getClassName() == null)
out.tag("jsp-file",s.getForcedPath());
+ else
+ out.tag(tag + "-class",origin(md,ot + tag + "-class"),s.getClassName());
if (s.getInitOrder() != 0)
out.tag("load-on-startup",Integer.toString(s.getInitOrder()));

Back to the top