Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-04 12:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed usage of special empty buffers, not needed.

Browse Source
This commit is contained in:
Simone Bordet 2016-12-16 11:19:18 +01:00
parent 8864361c1a
commit 91eb6a2405
1 changed files with 4 additions and 6 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/ssl/SslConnection.java
View File

@ -79,8 +79,6 @@ import org.eclipse.jetty.util.log.Logger;
public class SslConnection extends AbstractConnection public class SslConnection extends AbstractConnection
{ {
private static final Logger LOG = Log.getLogger(SslConnection.class); private static final Logger LOG = Log.getLogger(SslConnection.class);
private static final ByteBuffer __FILL_CALLED_FLUSH= BufferUtil.allocate(0);
private static final ByteBuffer __FLUSH_CALLED_FILL= BufferUtil.allocate(0);
private final List<SslHandshakeListener> handshakeListeners = new ArrayList<>(); private final List<SslHandshakeListener> handshakeListeners = new ArrayList<>();
private final ByteBufferPool _bufferPool; private final ByteBufferPool _bufferPool;
@ -666,11 +664,11 @@ public class SslConnection extends AbstractConnection
{ {
// If we are called from flush() // If we are called from flush()
// return to let it do the wrapping. // return to let it do the wrapping.
if (buffer == __FLUSH_CALLED_FILL) if (_flushRequiresFillToProgress)
return 0; return 0;
_fillRequiresFlushToProgress = true; _fillRequiresFlushToProgress = true;
flush(__FILL_CALLED_FLUSH); flush(BufferUtil.EMPTY_BUFFER);
if (BufferUtil.isEmpty(_encryptedOutput)) if (BufferUtil.isEmpty(_encryptedOutput))
{ {
// The flush wrote all the encrypted bytes so continue to fill. // The flush wrote all the encrypted bytes so continue to fill.
@ -899,11 +897,11 @@ public class SslConnection extends AbstractConnection
case NEED_UNWRAP: case NEED_UNWRAP:
// Ah we need to fill some data so we can write. // Ah we need to fill some data so we can write.
// So if we were not called from fill and the app is not reading anyway // So if we were not called from fill and the app is not reading anyway
if (appOuts[0]!=__FILL_CALLED_FLUSH && !getFillInterest().isInterested()) if (!_fillRequiresFlushToProgress && !getFillInterest().isInterested())
{ {
// Tell the onFillable method that there might be a write to complete // Tell the onFillable method that there might be a write to complete
_flushRequiresFillToProgress = true; _flushRequiresFillToProgress = true;
fill(__FLUSH_CALLED_FILL); fill(BufferUtil.EMPTY_BUFFER);
// Check if after the fill() we need to wrap again // Check if after the fill() we need to wrap again
if (_sslEngine.getHandshakeStatus() == HandshakeStatus.NEED_WRAP) if (_sslEngine.getHandshakeStatus() == HandshakeStatus.NEED_WRAP)
continue; continue;