You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2016/02/16 15:39:43 UTC

[2/3] mina git commit: Mark the buffer to be able to reset it

Mark the buffer to be able to reset it

Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/c69999b9
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/c69999b9
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/c69999b9

Branch: refs/heads/2.0
Commit: c69999b916446d632c6d0167eb3ee6017e7296e3
Parents: 44b5846
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Feb 16 15:38:40 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Feb 16 15:38:40 2016 +0100

----------------------------------------------------------------------
 mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/c69999b9/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
index 59e67ed..e91ab6b 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
@@ -630,6 +630,7 @@ public class SslFilter extends IoFilterAdapter {
                         sslHandler.scheduleFilterWrite(nextFilter, writeRequest);
                     } else if (sslHandler.isHandshakeComplete()) {
                         // SSL encrypt
+                        buf.mark();
                         sslHandler.encrypt(buf.buf());
                         IoBuffer encryptedBuffer = sslHandler.fetchOutNetBuffer();
                         sslHandler.scheduleFilterWrite(nextFilter, new EncryptedWriteRequest(writeRequest,