[jboss-cvs] JBoss Messaging SVN: r7686 - in trunk: src/main/org/jboss/messaging/core/server/impl and 1 other directories.

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

Author: timfox
Date: 2009-08-07 05:51:39 -0400 (Fri, 07 Aug 2009)
New Revision: 7686

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ManualReconnectionToSingleServerTest.java
Log:
stricter version check

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-07 09:48:28 UTC (rev 7685)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-08-07 09:51:39 UTC (rev 7686)
@@ -1019,6 +1019,8 @@
          // Can be legitimately null if session was closed before then went to remove session from csf
          // and locked since failover had started then after failover removes it but it's already been failed
       } 
+      
+      log.info("Returning connection, now " + this.connections.size() + " pingers " + this.pingers.size());
    }
 
    private void failConnections(final MessagingException me)

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-08-07 09:48:28 UTC (rev 7685)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-08-07 09:51:39 UTC (rev 7686)
@@ -1337,10 +1337,13 @@
                                                         final int sendWindowSize,
                                                         final boolean backup) throws Exception
    {
-      if (version.getIncrementingVersion() < incrementingVersion)
+      if (version.getIncrementingVersion() != incrementingVersion)
       {
          throw new MessagingException(MessagingException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS,
-                                      "client not compatible with version: " + version.getFullVersion());
+                                      "Client with version " + incrementingVersion + " is not compatible with server version " +
+                                      version.getFullVersion()  + ". " +
+                                      "Please ensure all clients and servers are upgraded to the same version for them to " +
+                                      "interoperate");
       }
 
       // Is this comment relevant any more ?

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ManualReconnectionToSingleServerTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ManualReconnectionToSingleServerTest.java	2009-08-07 09:48:28 UTC (rev 7685)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ManualReconnectionToSingleServerTest.java	2009-08-07 09:51:39 UTC (rev 7686)
@@ -199,6 +199,8 @@
    @Override
    protected void tearDown() throws Exception
    {
+      connection.close();
+      
       server.stop();
 
       super.tearDown();