From 44658812c0443c8d761207736415e4bde5ea2152 Mon Sep 17 00:00:00 2001 From: Juha Paananen Date: Wed, 11 Jan 2017 14:36:02 +0200 Subject: [PATCH 1/4] initialize _availability variable to prevent NPE in isShutdown Signed-off-by: Juha Paananen --- .../java/org/eclipse/jetty/server/handler/ContextHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index f0a4f68661f..79013d08b69 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -206,7 +206,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu private final CopyOnWriteArrayList _aliasChecks = new CopyOnWriteArrayList(); public enum Availability { UNAVAILABLE,STARTING,AVAILABLE,SHUTDOWN,}; - private volatile Availability _availability; + private volatile Availability _availability = Availability.UNAVAILABLE; /* ------------------------------------------------------------ */ public ContextHandler() From ccb62f5137bfe02b09eb35b346aacb3c610e2edb Mon Sep 17 00:00:00 2001 From: Juha Paananen Date: Wed, 11 Jan 2017 14:44:17 +0200 Subject: [PATCH 2/4] fix comment Signed-off-by: Juha Paananen --- .../java/org/eclipse/jetty/server/handler/ContextHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 79013d08b69..a9d50b3662a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -684,7 +684,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu /* ------------------------------------------------------------ */ /** - * @return true if this context is accepting new requests + * @return true if this context is shutting down */ @ManagedAttribute("true for graceful shutdown, which allows existing requests to complete") public boolean isShutdown() From 59625b1332ebd5376f73da0286c92f30fb33d44c Mon Sep 17 00:00:00 2001 From: Juha Paananen Date: Wed, 11 Jan 2017 14:44:26 +0200 Subject: [PATCH 3/4] simplify Signed-off-by: Juha Paananen --- .../org/eclipse/jetty/server/handler/ContextHandler.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index a9d50b3662a..83e8673059e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -689,13 +689,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu @ManagedAttribute("true for graceful shutdown, which allows existing requests to complete") public boolean isShutdown() { - switch(_availability) - { - case SHUTDOWN: - return true; - default: - return false; - } + return _availability == Availability.SHUTDOWN; } /* ------------------------------------------------------------ */ From 46b7037ca89cc03b70c7266fa434dd233a37c8f6 Mon Sep 17 00:00:00 2001 From: Juha Paananen Date: Wed, 11 Jan 2017 14:44:35 +0200 Subject: [PATCH 4/4] add test for isShutdown Signed-off-by: Juha Paananen --- .../eclipse/jetty/server/handler/ContextHandlerTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java index f2054c9c83e..0423275394f 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java @@ -447,7 +447,11 @@ public class ContextHandlerTest Assert.assertTrue(handler.isProtectedTarget("/ABC/7777")); } - + @Test + public void testIsShutdown() { + ContextHandler handler = new ContextHandler(); + Assert.assertEquals(false, handler.isShutdown()); + } private void checkResourcePathsForExampleWebApp(String root) throws IOException {