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

maintain own ishut status

This commit is contained in:
Greg Wilkins 2011-11-16 13:12:19 +11:00
parent a8173e3d12
commit 9ac9a1d687
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ public class ChannelEndPoint implements EndPoint
protected final InetSocketAddress _local;
protected final InetSocketAddress _remote;
protected int _maxIdleTime;
private boolean _ishut;
public ChannelEndPoint(ByteChannel channel) throws IOException
{
@ -126,17 +127,16 @@ public class ChannelEndPoint implements EndPoint
// System.err.println(e);
LOG.debug(e.toString());
LOG.ignore(e);
if (!_socket.isClosed())
close();
}
finally
{
_ishut=true;
if(_socket.isOutputShutdown() && !_socket.isClosed())
close();
}
}
else
close();
_ishut=true;
}
}
@ -172,7 +172,7 @@ public class ChannelEndPoint implements EndPoint
}
finally
{
if (_socket.isInputShutdown() && !_socket.isClosed())
if ((_ishut||_socket.isInputShutdown()) && !_socket.isClosed())
close();
}
}
@ -196,7 +196,7 @@ public class ChannelEndPoint implements EndPoint
public boolean isInputShutdown()
{
return !_channel.isOpen() || _socket!=null && _socket.isInputShutdown();
return !_channel.isOpen() || _ishut || _socket!=null && _socket.isInputShutdown();
}
/* (non-Javadoc)