Merge remote-tracking branch 'origin/jetty-8'

2013-05-03 16:20:51 +10:00 · 2013-05-03 16:20:51 +10:00 · dfbef2db05
parent d351e0790a f4ee8ba48d
commit dfbef2db05
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
@ -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();
    }

    /* ------------------------------------------------------------ */