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

412940 minor threadsafe fixes

This commit is contained in:
Greg Wilkins 2013-07-15 16:40:27 +10:00
parent 5d3760b17d
commit cbc0a114f4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,6 +267,8 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
protected void interruptAcceptors() protected void interruptAcceptors()
{
synchronized (this)
{ {
for (Thread thread : _acceptors) for (Thread thread : _acceptors)
{ {
@ -274,6 +276,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
thread.interrupt(); thread.interrupt();
} }
} }
}
@Override @Override
public Future<Void> shutdown() public Future<Void> shutdown()
@ -305,11 +308,14 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
} }
public void join(long timeout) throws InterruptedException public void join(long timeout) throws InterruptedException
{
synchronized (this)
{ {
for (Thread thread : _acceptors) for (Thread thread : _acceptors)
if (thread != null) if (thread != null)
thread.join(timeout); thread.join(timeout);
} }
}
protected abstract void accept(int acceptorID) throws IOException, InterruptedException; protected abstract void accept(int acceptorID) throws IOException, InterruptedException;