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

improved shutdown handling for travis CI

This commit is contained in:
Greg Wilkins 2013-04-11 12:01:01 +10:00
parent a0ec3b6834
commit 9bb0260410
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -289,8 +289,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
// If we have a stop timeout
long stopTimeout = getStopTimeout();
if (stopTimeout > 0 && _stopping!=null)
_stopping.await(stopTimeout,TimeUnit.MILLISECONDS);
CountDownLatch stopping=_stopping;
if (stopTimeout > 0 && stopping!=null)
stopping.await(stopTimeout,TimeUnit.MILLISECONDS);
_stopping=null;
super.doStop();
@ -475,7 +476,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
{
_acceptors[_acceptor] = null;
}
_stopping.countDown();
CountDownLatch stopping=_stopping;
if (stopping!=null)
stopping.countDown();
}
}
}