Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1238 from raimohanska/jetty-9.4.x 

Fix NPE in ContextHandler.isShutdown
This commit is contained in:
Jan Bartel 2017-03-30 09:38:25 +11:00 committed by GitHub
parent 071cf19f2b 46b7037ca8
commit 9732e3a985
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -206,7 +206,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
private final CopyOnWriteArrayList<AliasCheck> _aliasChecks = new CopyOnWriteArrayList<ContextHandler.AliasCheck>(); private final CopyOnWriteArrayList<AliasCheck> _aliasChecks = new CopyOnWriteArrayList<ContextHandler.AliasCheck>();
public enum Availability { UNAVAILABLE,STARTING,AVAILABLE,SHUTDOWN,}; public enum Availability { UNAVAILABLE,STARTING,AVAILABLE,SHUTDOWN,};
private volatile Availability _availability; private volatile Availability _availability = Availability.UNAVAILABLE;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public ContextHandler() public ContextHandler()
@ -684,18 +684,12 @@ 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") @ManagedAttribute("true for graceful shutdown, which allows existing requests to complete")
public boolean isShutdown() public boolean isShutdown()
{ {
switch(_availability) return _availability == Availability.SHUTDOWN;
{
case SHUTDOWN:
return true;
default:
return false;
}
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */

6
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java
View File

@ -447,7 +447,11 @@ public class ContextHandlerTest
Assert.assertTrue(handler.isProtectedTarget("/ABC/7777")); 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 private void checkResourcePathsForExampleWebApp(String root) throws IOException
{ {