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

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

Author: timfox
Date: 2007-08-07 05:57:36 -0400 (Tue, 07 Aug 2007)
New Revision: 2966

Modified:
   trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedRequestResponseTest.java
Log:
More tweaks


Modified: trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-08-07 09:40:25 UTC (rev 2965)
+++ trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-08-07 09:57:36 UTC (rev 2966)
@@ -201,10 +201,10 @@
     */
    public void notify(ClusterNotification notification)
 	{	
-		if (notification.type == ClusterNotification.TYPE_FAILOVER_START)
+		if (notification.type == ClusterNotification.TYPE_NODE_LEAVE)
 		{
 
-         log.trace("SimpleConnectionManager was notified about FailoverStart from node " +
+         log.trace("SimpleConnectionManager was notified about node leaving from node " +
                     notification.nodeID);
          try
 			{

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-08-07 09:40:25 UTC (rev 2965)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-08-07 09:57:36 UTC (rev 2966)
@@ -878,6 +878,10 @@
       
       boolean doneFailover = false;
       
+      ClusterNotification notification = new ClusterNotification(ClusterNotification.TYPE_NODE_LEAVE, leftNodeID.intValue(), null);
+      
+      clusterNotifier.sendNotification(notification);
+      
       if (crashed && isSupportsFailover())
       {	      
 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedRequestResponseTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedRequestResponseTest.java	2007-08-07 09:40:25 UTC (rev 2965)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedRequestResponseTest.java	2007-08-07 09:57:36 UTC (rev 2966)
@@ -83,9 +83,9 @@
 
    protected void setUp() throws Exception
    {
-   	nodeCount = 2;
+   	nodeCount = 3;
    	
-      super.setUp();
+      super.setUp();     
    }
 
    protected void tearDown() throws Exception