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

Modified behavior of shutdownInput() and shutdownOutput() to always shutdown either input or output. 

Calling socket.close() does not imply that socket.isInputShutdown() returns true, so there was a
possibility that code was calling ChannelEndPoint.shutdownInput(), but the input was not really
shutdown, and a subsequent call to ChannelEndPoint.isInputShutdown() returned false.
This commit is contained in:
Simone Bordet 2011-11-04 15:22:43 +01:00
parent f01877e738
commit f1251412e4
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
View File

@ -112,10 +112,18 @@ public class ChannelEndPoint implements EndPoint
Socket socket= ((SocketChannel)_channel).socket(); Socket socket= ((SocketChannel)_channel).socket();
if (!socket.isClosed()) if (!socket.isClosed())
{ {
if(socket.isOutputShutdown())
socket.close(); try
else if (!socket.isInputShutdown()) {
socket.shutdownInput(); if (!socket.isInputShutdown())
socket.shutdownInput();
if (socket.isOutputShutdown())
socket.close();
}
catch (SocketException e)
{
LOG.ignore(e);
}
} }
} }
} }
@ -132,12 +140,12 @@ public class ChannelEndPoint implements EndPoint
{ {
try try
{ {
if (!socket.isOutputShutdown())
socket.shutdownOutput();
if (socket.isInputShutdown()) if (socket.isInputShutdown())
socket.close(); socket.close();
else if (!socket.isOutputShutdown())
socket.shutdownOutput();
} }
catch(SocketException e) catch (SocketException e)
{ {
LOG.ignore(e); LOG.ignore(e);
} }
@ -174,7 +182,7 @@ public class ChannelEndPoint implements EndPoint
{ {
final NIOBuffer nbuf = (NIOBuffer)buf; final NIOBuffer nbuf = (NIOBuffer)buf;
final ByteBuffer bbuf=nbuf.getByteBuffer(); final ByteBuffer bbuf=nbuf.getByteBuffer();
//noinspection SynchronizationOnLocalVariableOrMethodParameter //noinspection SynchronizationOnLocalVariableOrMethodParameter
try try
{ {
@ -211,7 +219,7 @@ public class ChannelEndPoint implements EndPoint
{ {
LOG.ignore(xx); LOG.ignore(xx);
} }
if (len>0) if (len>0)
throw x; throw x;
len=-1; len=-1;
@ -221,7 +229,7 @@ public class ChannelEndPoint implements EndPoint
{ {
throw new IOException("Not Implemented"); throw new IOException("Not Implemented");
} }
return len; return len;
} }