Filter chaing for old SSL: SSLFilter - ExecutorFilter - ProtocolFilter. JM-970

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7058 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/spi/ConnectionManagerImpl.java

@@ -14,8 +14,10 @@ package org.jivesoftware.wildfire.spi;
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.ExecutorThreadModel;
 import org.apache.mina.common.SimpleByteBufferAllocator;
+import org.apache.mina.common.ThreadModel;
 import org.apache.mina.filter.SSLFilter;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.executor.ExecutorFilter;
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketSessionConfig;
@@ -42,10 +44,8 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class ConnectionManagerImpl extends BasicModule implements ConnectionManager, CertificateEventListener {
 
@@ -297,16 +297,31 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
                 // Create SocketAcceptor with correct number of processors
                 sslSocketAcceptor = buildSocketAcceptor();
                 // Customize Executor that will be used by processors to process incoming stanzas
-                ExecutorThreadModel threadModel = ExecutorThreadModel.getInstance("client_ssl");
                 int eventThreads = JiveGlobals.getIntProperty("xmpp.client_ssl.processing.threads", 16);
-                ThreadPoolExecutor eventExecutor = (ThreadPoolExecutor)threadModel.getExecutor();
+                ExecutorFilter executorFilter = new ExecutorFilter();
+                ThreadPoolExecutor eventExecutor = (ThreadPoolExecutor)executorFilter.getExecutor();
+                final ThreadFactory originalThreadFactory = eventExecutor.getThreadFactory();
+                ThreadFactory newThreadFactory = new ThreadFactory()
+                {
+                    private final AtomicInteger threadId = new AtomicInteger( 0 );
+
+                    public Thread newThread( Runnable runnable )
+                    {
+                        Thread t = originalThreadFactory.newThread( runnable );
+                        t.setName("Old SSL executor thread - " + threadId.incrementAndGet() );
+                        t.setDaemon( true );
+                        return t;
+                    }
+                };
+                eventExecutor.setThreadFactory( newThreadFactory );
                 eventExecutor.setCorePoolSize(eventThreads + 1);
                 eventExecutor.setMaximumPoolSize(eventThreads + 1);
                 eventExecutor.setKeepAliveTime(60, TimeUnit.SECONDS);
 
-                sslSocketAcceptor.getDefaultConfig().setThreadModel(threadModel);
+                sslSocketAcceptor.getDefaultConfig().setThreadModel(ThreadModel.MANUAL);
                 // Add the XMPP codec filter
                 sslSocketAcceptor.getFilterChain().addFirst("xmpp", new ProtocolCodecFilter(new XMPPCodecFactory()));
+                sslSocketAcceptor.getFilterChain().addFirst("threadModel", executorFilter);
 
                 // Add the SSL filter now since sockets are "borned" encrypted in the old ssl method
                 SSLContext sslContext = SSLContext.getInstance(algorithm);