439387 Ensure empty servlet-class never generated for quickstart

3 files changed, 9 insertions, 17 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()));
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
index d180e46fda..2ed3b50285 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
@@ -849,18 +849,6 @@ public class ServletHandler extends ScopedHandler
             {
                 try
                 {
-                   /* if (servlet.getClassName() == null && servlet.getForcedPath() != null)
-                    {
-                        ServletHolder forced_holder = _servletPathMap.match(servlet.getForcedPath());
-                        if (forced_holder == null || forced_holder.getClassName() == null)
-                        {
-                            mx.add(new IllegalStateException("No forced path servlet for " + servlet.getForcedPath()));
-                            continue;
-                        }
-                        System.err.println("ServletHandler setting forced path classname to "+forced_holder.getClassName()+ " for "+servlet.getForcedPath());
-                        servlet.setClassName(forced_holder.getClassName());
-                    }*/
-                    
                     servlet.start();
                     servlet.initialize();
                 }
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 c2ac6f6d87..7336b6dcee 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
@@ -283,10 +283,11 @@ public class StandardDescriptorProcessor extends IterativeDescriptorProcessor
         }
 
         String servlet_class = node.getString("servlet-class", false, true);
-
+        if ("".equals(servlet_class))
+            servlet_class = null;
 
         //Handle the default jsp servlet instance
-        if (id != null && id.equals("jsp"))
+        if (id != null && id.equals("jsp") && servlet_class != null)
         {
             try
             {