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 2018/04/02 08:23:02 UTC

[4/6] mina git commit: Don't call the SSLEngine.beginHandshake(). This is useless, if the NOT_HANDSHAKING state is properly handled by the handshake() method.

Don't call the SSLEngine.beginHandshake(). This is useless, if
the NOT_HANDSHAKING state is properly handled by the handshake()
method.

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

Branch: refs/heads/2.0
Commit: f617accadce9cb60fdfa12ccb23d7e4df8c1a2ef
Parents: 7c4dc7b
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Mar 31 09:43:29 2018 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Mar 31 09:43:29 2018 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/mina/filter/ssl/SslHandler.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/f617acca/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
index a0d29b7..72bf0e6 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
@@ -181,8 +181,6 @@ class SslHandler {
 
         // TODO : we may not need to call this method...
         // However, if we don't call it here, the tests are failing. Why?
-        sslEngine.beginHandshake();
-
         handshakeStatus = sslEngine.getHandshakeStatus();
 
         // Default value
@@ -531,7 +529,6 @@ class SslHandler {
         for (;;) {
             switch (handshakeStatus) {
             case FINISHED:
-            case NOT_HANDSHAKING:
                 if (LOGGER.isDebugEnabled()) {
                     LOGGER.debug("{} processing the FINISHED state", sslFilter.getSessionInfo(session));
                 }
@@ -580,6 +577,7 @@ class SslHandler {
                 break;
 
             case NEED_WRAP:
+            case NOT_HANDSHAKING:
                 if (LOGGER.isDebugEnabled()) {
                     LOGGER.debug("{} processing the NEED_WRAP state", sslFilter.getSessionInfo(session));
                 }