Commit 9df13949 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Temp workaround for SSLFilter deadlock.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6596 b35dd754-fafc-0310-a699-88a17e54d16e
parent d1a35129
...@@ -294,8 +294,10 @@ public class NIOConnection implements Connection { ...@@ -294,8 +294,10 @@ public class NIOConnection implements Connection {
filter.setWantClientAuth(true); filter.setWantClientAuth(true);
} }
} }
// TODO Temporary workaround (placing SSLFilter before ExecutorFilter) to avoid deadlock. Waiting for
ioSession.getFilterChain().addAfter("org.apache.mina.common.ExecutorThreadModel", "tls", filter); // MINA devs feedback
ioSession.getFilterChain().addBefore("org.apache.mina.common.ExecutorThreadModel", "tls", filter);
//ioSession.getFilterChain().addAfter("org.apache.mina.common.ExecutorThreadModel", "tls", filter);
ioSession.setAttribute(SSLFilter.DISABLE_ENCRYPTION_ONCE, Boolean.TRUE); ioSession.setAttribute(SSLFilter.DISABLE_ENCRYPTION_ONCE, Boolean.TRUE);
if (!clientMode) { if (!clientMode) {
// Indicate the client that the server is ready to negotiate TLS // Indicate the client that the server is ready to negotiate TLS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment