You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/04/24 20:36:14 UTC
svn commit: r164494 -
/directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java
/directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java
Author: trustin
Date: Sun Apr 24 11:36:13 2005
New Revision: 164494
URL: http://svn.apache.org/viewcvs?rev=164494&view=rev
Log:
Fixed: SSLHandler.doHandshake is sometimes called more then two time at the same time.
Modified:
directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java
directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java
Modified: directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java?rev=164494&r1=164493&r2=164494&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java Sun Apr 24 11:36:13 2005
@@ -445,10 +445,6 @@
if( !sslHandler.getOutNetBuffer().hasRemaining() )
{
// no; bail out
- if( debug != null )
- {
- debug.print( this, "net data is empty" );
- }
return;
}
Modified: directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java?rev=164494&r1=164493&r2=164494&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java Sun Apr 24 11:36:13 2005
@@ -399,7 +399,7 @@
/**
* Perform any handshaking processing.
*/
- void doHandshake() throws SSLException
+ synchronized void doHandshake() throws SSLException
{
if( parent.debug != null )
@@ -407,7 +407,7 @@
parent.debug.print( parent, "doHandshake()" );
}
- while( true )
+ while( !initialHandshakeComplete )
{
if( initialHandshakeStatus == SSLEngineResult.HandshakeStatus.FINISHED )
{