Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2014-05-13 09:21:38 +0000
committerJan Bartel2014-05-13 09:21:38 +0000
commitfb2010177c55c6c144e1e52dd9aa1321b534e089 (patch)
tree5b95908afe3340a7749147016011f5991e864d5f
parent9fb6e96a4099b4c58c9e5ccb85ac5acee5796c1c (diff)
downloadorg.eclipse.jetty.project-fb2010177c55c6c144e1e52dd9aa1321b534e089.tar.gz
org.eclipse.jetty.project-fb2010177c55c6c144e1e52dd9aa1321b534e089.tar.xz
org.eclipse.jetty.project-fb2010177c55c6c144e1e52dd9aa1321b534e089.zip
434715 Avoid call to ServletHolder.getServlet() during handle() iff servlet is available and instantiated
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
index 63e8b0898e..1df08b33dc 100644
--- 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);

Back to the top