Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-06-17 04:39:17 +0000
committerJan Bartel2013-06-17 04:39:17 +0000
commit2ea7843d867b69b61691541cadc8f091b14a7d28 (patch)
treed7726916d6cac6bc4a4464d402476d9b4cd3019d /jetty-servlet
parent59889bc14985aa92e0c217b16158d627bc2fa75a (diff)
parent1908fff38fe66c40382ec4ff404b21637bf10efb (diff)
downloadorg.eclipse.jetty.project-2ea7843d867b69b61691541cadc8f091b14a7d28.tar.gz
org.eclipse.jetty.project-2ea7843d867b69b61691541cadc8f091b14a7d28.tar.xz
org.eclipse.jetty.project-2ea7843d867b69b61691541cadc8f091b14a7d28.zip
Merge remote-tracking branch 'origin/jetty-8'
Diffstat (limited to 'jetty-servlet')
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java2
1 files changed, 2 insertions, 0 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 297300199f..28fce42830 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
@@ -665,6 +665,8 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
Servlet servlet=_servlet;
synchronized(this)
{
+ if (!isStarted())
+ throw new UnavailableException("Servlet not initialized", -1);
if (_unavailable!=0 || !_initOnStartup)
servlet=getServlet();
if (servlet==null)

Back to the top