434715 Avoid call to ServletHolder.getServlet() during handle() iff servlet is available and instantiated

2014-05-13 11:21:38 +02:00 · 2014-05-13 11:21:38 +02:00 · fb2010177c
parent 9fb6e96a40
commit fb2010177c
1 changed files with 1 additions and 1 deletions
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
@ -720,7 +720,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
        {
            if (!isStarted())
                throw new UnavailableException("Servlet not initialized", -1);
-            if (_unavailable!=0 || !_initOnStartup)
+            if (_unavailable!=0 || (!_initOnStartup && servlet==null))
                servlet=getServlet();
            if (servlet==null)
                throw new UnavailableException("Could not instantiate "+_class);