You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/07/30 05:41:16 UTC

svn commit: r560852 - in /mina: branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/support/ branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/support/ trunk/core/src/main/java/org/apache/mina/filter/ssl/

Author: trustin
Date: Sun Jul 29 20:41:15 2007
New Revision: 560852

URL: http://svn.apache.org/viewvc?view=rev&rev=560852
Log:
Argh! Forgot to remove initialHandshakeComplete conditon in handshake() 


Modified:
    mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
    mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
    mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java

Modified: mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java?view=diff&rev=560852&r1=560851&r2=560852
==============================================================================
--- mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java (original)
+++ mina/branches/1.0/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java Sun Jul 29 20:41:15 2007
@@ -468,7 +468,7 @@
             SessionLog.debug(session, " doHandshake()");
         }
 
-        while (!initialHandshakeComplete) {
+        for (;;) {
             if (initialHandshakeStatus == SSLEngineResult.HandshakeStatus.FINISHED) {
                 session.setAttribute(SSLFilter.SSL_SESSION, sslEngine
                         .getSession());

Modified: mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java?view=diff&rev=560852&r1=560851&r2=560852
==============================================================================
--- mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java (original)
+++ mina/branches/1.1/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java Sun Jul 29 20:41:15 2007
@@ -465,7 +465,7 @@
             SessionLog.debug(session, " doHandshake()");
         }
 
-        while (!initialHandshakeComplete) {
+        for (;;) {
             if (initialHandshakeStatus == SSLEngineResult.HandshakeStatus.FINISHED) {
                 session.setAttribute(SSLFilter.SSL_SESSION, sslEngine
                         .getSession());

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java?view=diff&rev=560852&r1=560851&r2=560852
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java Sun Jul 29 20:41:15 2007
@@ -471,7 +471,7 @@
             SessionLog.debug(session, " doHandshake()");
         }
 
-        while (!initialHandshakeComplete) {
+        for (;;) {
             if (initialHandshakeStatus == SSLEngineResult.HandshakeStatus.FINISHED) {
                 session.setAttribute(SSLFilter.SSL_SESSION, sslEngine
                         .getSession());