Fixes 335681 (Improve ChannelEndPoint.close() to avoid spinning).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2704 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
cfd2c0e7d2
commit
dd7511a721
|
@ -29,6 +29,7 @@ jetty-7.3.0-SNAPSHOT
|
|||
+ 334311 fix buffer reuse issue in CachedExchange
|
||||
+ 335361 Fixed 'jetty.sh check' to show current PID when JETTY_PID env. variable is set
|
||||
+ 335641 Sweep for Windows selectKey.interestOps!=endp.interestOps for undispatched end points
|
||||
+ 335681 Improve ChannelEndPoint.close() to avoid spinning
|
||||
|
||||
jetty-7.2.2.v20101205 5 December 2010
|
||||
+ JETTY-1308 327109 (re)fixed AJP handling of empty packets
|
||||
|
|
|
@ -27,7 +27,6 @@ import org.eclipse.jetty.io.EndPoint;
|
|||
import org.eclipse.jetty.util.StringUtil;
|
||||
import org.eclipse.jetty.util.log.Log;
|
||||
|
||||
|
||||
/**
|
||||
* Channel End Point.
|
||||
* <p>Holds the channel and socket for an NIO endpoint.
|
||||
|
@ -125,7 +124,16 @@ public class ChannelEndPoint implements EndPoint
|
|||
public void close() throws IOException
|
||||
{
|
||||
if (_socket!=null && !_socket.isOutputShutdown())
|
||||
{
|
||||
try
|
||||
{
|
||||
_socket.shutdownOutput();
|
||||
}
|
||||
catch (IOException x)
|
||||
{
|
||||
Log.ignore(x);
|
||||
}
|
||||
}
|
||||
_channel.close();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue