[jboss-cvs] JBoss Messaging SVN: r7668 - in trunk/src/main/org/jboss/messaging: integration/transports/netty and 1 other directory.

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

Author: jmesnil
Date: 2009-08-05 11:15:54 -0400 (Wed, 05 Aug 2009)
New Revision: 7668

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
   trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnection.java
Log:
JBMESSAGING-1699: Server fails with message "Did not receive initial ping for connection"

* display the transport connection when the client does not receive a ping from the server
* override NettyConnection.toString() to display its local & remote addresses

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-08-05 13:33:43 UTC (rev 7667)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-08-05 15:15:54 UTC (rev 7668)
@@ -1142,7 +1142,7 @@
       public synchronized void run()
       {
          final MessagingException me = new MessagingException(MessagingException.CONNECTION_TIMEDOUT,
-                                                              "Did not receive ping from server");
+                                                              "Did not receive ping from server for " + conn.getTransportConnection());
 
          threadPool.execute(new Runnable()
          {

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnection.java	2009-08-05 13:33:43 UTC (rev 7667)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnection.java	2009-08-05 15:15:54 UTC (rev 7668)
@@ -161,6 +161,12 @@
 
    // Public --------------------------------------------------------
 
+   @Override
+   public String toString()
+   {
+      return super.toString() + "[local= " + channel.getLocalAddress() + ", remote=" + channel.getRemoteAddress() + "]";
+   }
+
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------