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

Issue #3481 cleanups 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2019-03-28 09:55:29 +11:00
parent e109116806
commit b7bae5c683
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -835,6 +835,10 @@ public class SslConnection extends AbstractConnection implements Connection.Upgr
LOG.debug("flush b[{}]={}", i++, BufferUtil.toDetailString(b));
}
// finish of any previous flushes
if (BufferUtil.hasContent(_encryptedOutput) && !getEndPoint().flush(_encryptedOutput))
return false;
Boolean result = null;
try
{
@ -866,7 +870,7 @@ public class SslConnection extends AbstractConnection implements Connection.Upgr
if (filled < 0)
throw new IOException("Broken pipe");
}
return result = false;
return result = appOuts.length==1 && BufferUtil.isEmpty(appOuts[0]);
default:
throw new IllegalStateException("Unexpected HandshakeStatus " + status);
@ -1098,13 +1102,15 @@ public class SslConnection extends AbstractConnection implements Connection.Upgr
if (flush && !flush(BufferUtil.EMPTY_BUFFER))
{
// We failed to flush. Try a one more after short delay just in case progress can be made
// We failed to flush. Retry after short delay just in case progress can be made
Thread.yield();
if (!getEndPoint().flush(_encryptedOutput) && !close)
if (!flush(BufferUtil.EMPTY_BUFFER) && !close)
{
// if we still can't flush, and we are not closing,
// if we still can't flush, but we are not closing the endpoint,
// let's just flush the encrypted output in the background.
// and continue as if we are closed
// and continue as if we are closed. The assumption here is that
// the encrypted buffer will contain the entire close handshake
// and that a call to flush(EMPTY_BUFFER) is not needed.
getEndPoint().write(Callback.NOOP, _encryptedOutput);
}
}