diff options
| author | Jan Bartel | 2013-05-03 06:20:51 +0000 |
|---|---|---|
| committer | Jan Bartel | 2013-05-03 06:20:51 +0000 |
| commit | dfbef2db05da1a68e774f250572c3b670ee651e7 (patch) | |
| tree | a0daf50abdf428f0c1bfd9828cd891a7e6e5c2f9 /jetty-servlet/src | |
| parent | d351e0790a75fd77344f6d426fa463ba757312cb (diff) | |
| parent | f4ee8ba48d77b7e571d21a52838a166b53530355 (diff) | |
| download | org.eclipse.jetty.project-dfbef2db05da1a68e774f250572c3b670ee651e7.tar.gz org.eclipse.jetty.project-dfbef2db05da1a68e774f250572c3b670ee651e7.tar.xz org.eclipse.jetty.project-dfbef2db05da1a68e774f250572c3b670ee651e7.zip | |
Merge remote-tracking branch 'origin/jetty-8'
Diffstat (limited to 'jetty-servlet/src')
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java | 2 |
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 1e50dd1249..77b3d4bc2c 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 @@ -385,8 +385,8 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope if (o==null) return; Servlet servlet = ((Servlet)o); - servlet.destroy(); getServletHandler().destroyServlet(servlet); + servlet.destroy(); } /* ------------------------------------------------------------ */ |