[jboss-cvs] JBoss Messaging SVN: r3544 - trunk/src/main/org/jboss/messaging/core/remoting/impl/mina.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-01-08 09:13:48 -0500 (Tue, 08 Jan 2008)
New Revision: 3544

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
Log:
* let MINA handle the lifecycle of its IoServices & filters

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java	2008-01-07 22:31:58 UTC (rev 3543)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java	2008-01-08 14:13:48 UTC (rev 3544)
@@ -74,11 +74,10 @@
       filterChain.addLast("logger", filter);
    }
    
-   static ExecutorFilter addExecutorFilter(DefaultIoFilterChainBuilder filterChain)
+   static void addExecutorFilter(DefaultIoFilterChainBuilder filterChain)
    {
       ExecutorFilter executorFilter = new ExecutorFilter();
       filterChain.addLast("executor", executorFilter);
-      return executorFilter;
    }
    
    static ScheduledExecutorService addBlockingRequestResponseFilter(

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java	2008-01-07 22:31:58 UTC (rev 3543)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java	2008-01-08 14:13:48 UTC (rev 3544)
@@ -9,6 +9,7 @@
 import static org.jboss.messaging.core.remoting.TransportType.TCP;
 import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addBlockingRequestResponseFilter;
 import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addCodecFilter;
+import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addExecutorFilter;
 import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addLoggingFilter;
 import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addMDCFilter;
 
@@ -16,6 +17,7 @@
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.apache.mina.common.CloseFuture;
@@ -60,9 +62,6 @@
 
    private Map<ConsolidatedRemotingConnectionListener, IoServiceListener> listeners = new HashMap<ConsolidatedRemotingConnectionListener, IoServiceListener>();
 
-   private ExecutorFilter executorFilter;
-
-
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
@@ -82,15 +81,11 @@
       DefaultIoFilterChainBuilder filterChain = connector.getFilterChain();
       
       addMDCFilter(filterChain);
-
       addCodecFilter(filterChain);
-
+      addLoggingFilter(filterChain);
       blockingScheduler = addBlockingRequestResponseFilter(filterChain);
+      addExecutorFilter(filterChain);
 
-      addLoggingFilter(filterChain);
-      
-      executorFilter = FilterChainSupport.addExecutorFilter(filterChain);
-
       connector.setHandler(new MinaHandler(PacketDispatcher.client));
       connector.getSessionConfig().setKeepAlive(true);
       connector.getSessionConfig().setReuseAddress(true);
@@ -125,12 +120,10 @@
 
       connector.dispose();
       blockingScheduler.shutdown();
-
+      
       connector = null;
       blockingScheduler = null;
       session = null;
-      
-      this.executorFilter.destroy();
 
       return closed;
    }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java	2008-01-07 22:31:58 UTC (rev 3543)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java	2008-01-08 14:13:48 UTC (rev 3544)
@@ -8,6 +8,7 @@
 
 import static org.jboss.messaging.core.remoting.ConnectorRegistrySingleton.REGISTRY;
 import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addCodecFilter;
+import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addExecutorFilter;
 import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addLoggingFilter;
 import static org.jboss.messaging.core.remoting.impl.mina.FilterChainSupport.addMDCFilter;
 
@@ -43,8 +44,6 @@
 
    private TransportType transport;
 
-   private ExecutorFilter executorFilter;
-
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
@@ -82,7 +81,7 @@
          addMDCFilter(filterChain);
          addCodecFilter(filterChain);
          addLoggingFilter(filterChain);
-         executorFilter = FilterChainSupport.addExecutorFilter(filterChain);
+         addExecutorFilter(filterChain);
          
          // Bind
          acceptor.setLocalAddress(new InetSocketAddress(host, port));
@@ -103,7 +102,6 @@
       if (acceptor != null)
       {
          acceptor.unbind();
-         executorFilter.destroy();
          acceptor.dispose();
          acceptor = null;