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

Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.

This commit is contained in:
Simone Bordet 2018-08-06 15:00:16 +02:00
parent f4a0bfbdd8 289dc935f1
commit 8eb11a56c8
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -546,7 +546,7 @@ public class SslConnection extends AbstractConnection
if (LOG.isDebugEnabled())
LOG.debug("net filled={}", net_filled);
if (net_filled > 0 && _handshake.get() == Handshake.INITIAL && _sslEngine.isOutboundDone())
if (net_filled > 0 && _handshake.get() == Handshake.INITIAL && isOutboundDone())
throw new SSLHandshakeException("Closed during handshake");
// Let's unwrap even if we have no net data because in that
@ -783,6 +783,10 @@ public class SslConnection extends AbstractConnection
else
LOG.ignore(x);
}
catch (Throwable x)
{
LOG.ignore(x);
}
}
@Override
@ -1036,7 +1040,7 @@ public class SslConnection extends AbstractConnection
if (!_closedOutbound)
{
_closedOutbound=true; // Only attempt this once
_sslEngine.closeOutbound();
closeOutbound();
flush = true;
}
@ -1059,6 +1063,18 @@ public class SslConnection extends AbstractConnection
}
}
private void closeOutbound()
{
try
{
_sslEngine.closeOutbound();
}
catch (Throwable x)
{
LOG.ignore(x);
}
}
private void ensureFillInterested()
{
if (LOG.isDebugEnabled())
@ -1069,7 +1085,20 @@ public class SslConnection extends AbstractConnection
@Override
public boolean isOutputShutdown()
{
return _sslEngine.isOutboundDone() || getEndPoint().isOutputShutdown();
return isOutboundDone() || getEndPoint().isOutputShutdown();
}
private boolean isOutboundDone()
{
try
{
return _sslEngine.isOutboundDone();
}
catch (Throwable x)
{
LOG.ignore(x);
return true;
}
}
@Override
@ -1090,7 +1119,20 @@ public class SslConnection extends AbstractConnection
@Override
public boolean isInputShutdown()
{
return getEndPoint().isInputShutdown() || _sslEngine.isInboundDone();
return getEndPoint().isInputShutdown() || isInboundDone();
}
private boolean isInboundDone()
{
try
{
return _sslEngine.isInboundDone();
}
catch (Throwable x)
{
LOG.ignore(x);
return true;
}
}
private void notifyHandshakeSucceeded(SSLEngine sslEngine)