diff options
| author | Jan Bartel | 2013-06-17 10:37:06 +0000 |
|---|---|---|
| committer | Jan Bartel | 2013-06-17 10:37:06 +0000 |
| commit | 0e4fbcb1ca60941438cf16e4e6d14c4e9f585e65 (patch) | |
| tree | d78fb3f15d695d5609fddd9ba8ed3782782f9412 | |
| parent | 6b9742ff86fa5b270b1c2c549aa3f97071afdaed (diff) | |
| download | org.eclipse.jetty.project-0e4fbcb1ca60941438cf16e4e6d14c4e9f585e65.tar.gz org.eclipse.jetty.project-0e4fbcb1ca60941438cf16e4e6d14c4e9f585e65.tar.xz org.eclipse.jetty.project-0e4fbcb1ca60941438cf16e4e6d14c4e9f585e65.zip | |
410693 ServletContextHandler.setHandler does not relink handlers - check for null
| -rw-r--r-- | jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java index ab388e8afb..991ff844c6 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java @@ -508,7 +508,7 @@ public class ServletContextHandler extends ContextHandler setSessionHandler((SessionHandler) handler); else if (handler instanceof SecurityHandler) setSecurityHandler((SecurityHandler)handler); - else if (handler instanceof HandlerWrapper) + else if (handler == null || handler instanceof HandlerWrapper) { super.setHandler(handler); relinkHandlers(); |