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

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

Author: trustin
Date: 2008-08-18 04:54:56 -0400 (Mon, 18 Aug 2008)
New Revision: 4812

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java
Log:
* Shut down the executors before setting state variables to null
* Fixed a problem where connectionDestroyed is called even when a connection attempt failed

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java	2008-08-18 08:53:15 UTC (rev 4811)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnector.java	2008-08-18 08:54:56 UTC (rev 4812)
@@ -169,10 +169,10 @@
          return;
       }
 
+      bootstrap = null;
+      channelFactory = null;
       bossExecutor.shutdown();
       workerExecutor.shutdown();
-      bootstrap = null;
-      channelFactory = null;
    }
 
    public Connection createConnection()
@@ -212,7 +212,7 @@
       }
 
       @Override
-      public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception
+      public void channelDisconnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception
       {
          listener.connectionDestroyed(e.getChannel().getId());
       }
@@ -221,7 +221,7 @@
       public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception
       {
          log.error(
-               "caught exception " + e.getCause() + " for session " +
+               "caught exception " + e.getCause() + " for channel " +
                e.getChannel(), e.getCause());
 
          MessagingException me = new MessagingException(MessagingException.INTERNAL_ERROR, "Netty exception");