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 2012/10/06 01:34:19 UTC
svn commit: r1394860 -
/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
Author: elecharny
Date: Fri Oct 5 23:34:18 2012
New Revision: 1394860
URL: http://svn.apache.org/viewvc?rev=1394860&view=rev
Log:
Reverted the modification made in DIRMINA-645 : it was forbidding the initialization of the handshake
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java?rev=1394860&r1=1394859&r2=1394860&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java Fri Oct 5 23:34:18 2012
@@ -416,6 +416,9 @@ public class SslFilter extends IoFilterA
@Override
public void onPostAdd(IoFilterChain parent, String name, NextFilter nextFilter) throws SSLException {
+ if (autoStart == START_HANDSHAKE) {
+ initiateHandshake(nextFilter, parent.getSession());
+ }
}
@Override
@@ -426,15 +429,6 @@ public class SslFilter extends IoFilterA
session.removeAttribute(SSL_HANDLER);
}
- @Override
- public void sessionCreated(NextFilter nextFilter, IoSession session) throws Exception {
- super.sessionCreated(nextFilter, session);
-
- if (autoStart) {
- initiateHandshake(nextFilter, session);
- }
- }
-
// IoFilter impl.
@Override
public void sessionClosed(NextFilter nextFilter, IoSession session) throws SSLException {