356751 Add null protection to ServletContextHandler.doStop

2011-09-06 09:25:55 +10:00 · 2011-09-06 09:25:55 +10:00 · a96052def2
parent 44204a2e5b
commit a96052def2
1 changed files with 4 additions and 2 deletions
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
@ -142,8 +142,10 @@ public class ServletContextHandler extends ContextHandler
    protected void doStop() throws Exception
    {
        super.doStop();
-        _decorators.clear();
-        _wrapper.setHandler(null);
+        if (_decorators != null)
+            _decorators.clear();
+        if (_wrapper != null)
+            _wrapper.setHandler(null);
    }

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