From 0e4fbcb1ca60941438cf16e4e6d14c4e9f585e65 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 17 Jun 2013 20:37:06 +1000 Subject: [PATCH 1/2] 410693 ServletContextHandler.setHandler does not relink handlers - check for null --- .../java/org/eclipse/jetty/servlet/ServletContextHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ab388e8afb2..991ff844c6c 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(); From d3645ac28ca0f18cfe2fb397f1f74a66ccfac01a Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 17 Jun 2013 10:00:04 -0700 Subject: [PATCH 2/2] Testing git setup Signed-off-by: Joakim Erdfelt --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index fa2c9f2fcd2..f40e7e76c0c 100644 --- a/pom.xml +++ b/pom.xml @@ -736,3 +736,4 @@ +