[jboss-cvs] JBoss Messaging SVN: r4082 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/mina and 1 other directory.

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

Author: jmesnil
Date: 2008-04-21 04:59:00 -0400 (Mon, 21 Apr 2008)
New Revision: 4082

Modified:
   trunk/build-thirdparty.xml
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
Log:
update MINA version to 2.0.0-M2-20080418.144850

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2008-04-18 22:37:59 UTC (rev 4081)
+++ trunk/build-thirdparty.xml	2008-04-21 08:59:00 UTC (rev 4082)
@@ -99,7 +99,7 @@
       <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
       <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
       <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
-      <componentref name="apache-mina" version="2.0.0-M2-20080411.122259-16"/>
+      <componentref name="apache-mina" version="2.0.0-M2-20080418.144850"/>
       <componentref name="slf4j/log4j" version="1.4.3"/>
 
 

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-04-18 22:37:59 UTC (rev 4081)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FilterChainSupport.java	2008-04-21 08:59:00 UTC (rev 4082)
@@ -7,7 +7,6 @@
 package org.jboss.messaging.core.remoting.impl.mina;
 
 import static org.apache.mina.common.IdleStatus.BOTH_IDLE;
-import static org.apache.mina.common.IdleStatus.READER_IDLE;
 import static org.apache.mina.filter.keepalive.KeepAliveRequestTimeoutHandler.EXCEPTION;
 import static org.apache.mina.filter.logging.LogLevel.TRACE;
 import static org.apache.mina.filter.logging.LogLevel.WARN;
@@ -18,7 +17,6 @@
 import javax.net.ssl.SSLContext;
 
 import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.IdleStatus;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.filter.keepalive.KeepAliveFilter;
 import org.apache.mina.filter.logging.LoggingFilter;
@@ -72,9 +70,8 @@
                + ", keepAliveInterval=" + keepAliveInterval);
       }
 
-      // FIXME: IdleStatus.BOTH_IDLE should be used but it is buggy: https://issues.apache.org/jira/browse/DIRMINA-569
       KeepAliveFilter filter = new KeepAliveFilter(
-            new MinaKeepAliveFactory(factory, notifier), READER_IDLE, EXCEPTION, keepAliveInterval,
+            new MinaKeepAliveFactory(factory, notifier), BOTH_IDLE, EXCEPTION, keepAliveInterval,
             keepAliveTimeout);
       filter.setForwardEvent(true);
       filterChain.addLast("keep-alive", filter);

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-04-18 22:37:59 UTC (rev 4081)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java	2008-04-21 08:59:00 UTC (rev 4082)
@@ -224,9 +224,6 @@
 
    public void fireFailure(MessagingException me)
    {
-      if (acceptor.isDisposing())
-         return;
-      
       if (me instanceof RemotingException)
       {
          RemotingException re = (RemotingException) me;
@@ -284,6 +281,9 @@
 
       public void sessionDestroyed(IoSession session)
       {
+         if (session.isClosing())
+            return;
+
          long sessionID = session.getId();
          if (factory.getSessions().containsKey(sessionID))
          {