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

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

Author: clebert.suconic at jboss.com
Date: 2008-06-27 18:20:07 -0400 (Fri, 27 Jun 2008)
New Revision: 4623

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
Log:
Making MinaAcceptor more "EasyMock able"

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java	2008-06-27 20:29:26 UTC (rev 4622)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaAcceptor.java	2008-06-27 22:20:07 UTC (rev 4623)
@@ -23,7 +23,9 @@
 package org.jboss.messaging.core.remoting.impl.mina;
 
 import org.apache.mina.common.*;
+import org.apache.mina.transport.socket.SocketAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.jboss.messaging.core.config.Configuration;
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.Acceptor;
 import org.jboss.messaging.core.remoting.CleanUpNotifier;
@@ -43,7 +45,7 @@
    private static final Logger log = Logger.getLogger(MinaAcceptor.class);
 
    private ExecutorService threadPool;
-   private NioSocketAcceptor acceptor;
+   private SocketAcceptor acceptor;
    private IoServiceListener acceptorListener;
    private CleanUpNotifier cleanupNotifier;
    private RemotingService remotingService;
@@ -53,16 +55,18 @@
    {
       this.remotingService = remotingService;
       this.cleanupNotifier = cleanupNotifier;
-      acceptor = new NioSocketAcceptor();
+      this.acceptor = createAcceptor();
 
       acceptor.setSessionDataStructureFactory(new MessagingIOSessionDataStructureFactory());
 
       DefaultIoFilterChainBuilder filterChain = acceptor.getFilterChain();
       
-      log.info(remotingService.getConfiguration().getHost());
+      Configuration config = remotingService.getConfiguration();
+      
+      log.info(config.getHost());
 
       // addMDCFilter(filterChain);
-      if (remotingService.getConfiguration().isSSLEnabled())
+      if (config.isSSLEnabled())
       {
          chainSupport.addSSLFilter(filterChain, false, remotingService.getConfiguration().getKeyStorePath(),
                  remotingService.getConfiguration().getKeyStorePassword(), remotingService.getConfiguration()
@@ -116,11 +120,19 @@
     */
    public DefaultIoFilterChainBuilder getFilterChain()
    {
+      // TODO: get rid of this assert (Validate this condition on tests)
       assert acceptor != null;
 
       return acceptor.getFilterChain();
    }
+   
 
+   // This could be used in Override for tests (to replace an EasyMock for instance)
+   protected SocketAcceptor createAcceptor()
+   {
+      return new NioSocketAcceptor();
+   }
+
    private final class MinaSessionListener implements IoServiceListener
    {
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java	2008-06-27 20:29:26 UTC (rev 4622)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java	2008-06-27 22:20:07 UTC (rev 4623)
@@ -78,8 +78,15 @@
                       final boolean closeSessionOnExceptionCaught,
                       final boolean useExecutor)
    {
-      assert dispatcher != null;
-      assert executorService != null;
+      if (dispatcher == null)
+      {
+         throw new IllegalArgumentException ("argument dispatcher can't be null");
+      }
+      
+      if (executorService == null && useExecutor)
+      {
+         throw new IllegalArgumentException ("executorService can't be null");
+      }
 
       this.dispatcher = dispatcher;
       this.failureNotifier = failureNotifier;