JETTY-748 Prevent race close of socket by old acceptor threads
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2459 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
eb377e72e1
commit
e6760c5899
|
@ -9,6 +9,7 @@ jetty-7.2.1-SNAPSHOT
|
|||
+ 328778 Improved javadoc for secure session cookies
|
||||
+ 328782 allow per connection max idle time to be set
|
||||
+ 328885 web overrides do not override
|
||||
+ JETTY-748 Prevent race close of socket by old acceptor threads
|
||||
+ JETTY-1291 Extract query parameters even if POST content consumed
|
||||
+ JETTY-1295 Contexts mixed up when hot-deploying on virtual hosts
|
||||
|
||||
|
|
|
@ -867,15 +867,6 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
|
|||
{
|
||||
current.setPriority(old_priority);
|
||||
current.setName(name);
|
||||
try
|
||||
{
|
||||
if (_acceptor == 0)
|
||||
close();
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
Log.warn(e);
|
||||
}
|
||||
|
||||
synchronized (AbstractConnector.this)
|
||||
{
|
||||
|
|
|
@ -64,7 +64,6 @@ public class SelectChannelConnector extends AbstractNIOConnector
|
|||
private int _lowResourcesConnections;
|
||||
private int _lowResourcesMaxIdleTime;
|
||||
private int _localPort=-1;
|
||||
private Throwable _closedBy;
|
||||
|
||||
private final SelectorManager _manager = new SelectorManager()
|
||||
{
|
||||
|
@ -142,7 +141,6 @@ public class SelectChannelConnector extends AbstractNIOConnector
|
|||
_acceptChannel.close();
|
||||
_acceptChannel = null;
|
||||
_localPort=-2;
|
||||
_closedBy=new Throwable();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -176,8 +174,6 @@ public class SelectChannelConnector extends AbstractNIOConnector
|
|||
{
|
||||
synchronized(this)
|
||||
{
|
||||
if (_localPort<0)
|
||||
Log.warn("Closed By",_closedBy);
|
||||
return _localPort;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue