andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made sure flushPendingEncryptedWrites are called only when necessary

Browse Source
This commit is contained in:
Trustin Lee 2008-09-05 01:58:35 +00:00
parent ab4d7f7660
commit 27cc323dce
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -402,6 +402,7 @@ public class SslHandler extends FrameDecoder implements ChannelDownstreamHandler
ChannelBuffer msg; ChannelBuffer msg;
ByteBuffer outNetBuf = bufferPool.acquire(); ByteBuffer outNetBuf = bufferPool.acquire();
boolean success = true; boolean success = true;
boolean offered = false;
try { try {
loop: loop:
for (;;) { for (;;) {
@ -446,6 +447,7 @@ public class SslHandler extends FrameDecoder implements ChannelDownstreamHandler
pendingEncryptedWrites.offer(encryptedWrite); pendingEncryptedWrites.offer(encryptedWrite);
} }
} }
offered = true;
} else { } else {
switch (result.getHandshakeStatus()) { switch (result.getHandshakeStatus()) {
case NEED_WRAP: case NEED_WRAP:
@ -479,7 +481,9 @@ public class SslHandler extends FrameDecoder implements ChannelDownstreamHandler
} finally { } finally {
bufferPool.release(outNetBuf); bufferPool.release(outNetBuf);
flushPendingEncryptedWrites(context); if (offered) {
flushPendingEncryptedWrites(context);
}
if (!success) { if (!success) {
// Mark all remaining pending writes as failure if anything // Mark all remaining pending writes as failure if anything