[jboss-cvs] JBoss Messaging SVN: r8374 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864: src/main/org/jboss/messaging/core/impl/postoffice and 1 other directory.

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

Author: jbertram
Date: 2011-06-28 17:00:47 -0400 (Tue, 28 Jun 2011)
New Revision: 8374

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/.classpath
   branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
JBPAPP-6786

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/.classpath
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/.classpath	2011-06-28 20:34:43 UTC (rev 8373)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/.classpath	2011-06-28 21:00:47 UTC (rev 8374)
@@ -36,6 +36,7 @@
 	<classpathentry kind="lib" path="thirdparty/dom4j/lib/dom4j.jar"/>
 	<classpathentry kind="lib" path="thirdparty/javassist/lib/javassist.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jdk14-pluggable-instrumentor.jar"/>
+	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/backport-util-concurrent.jar"/>

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2011-06-28 20:34:43 UTC (rev 8373)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP11_JBMESSAGING-1864/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2011-06-28 21:00:47 UTC (rev 8374)
@@ -3410,15 +3410,6 @@
 
          // TODO - does this need to be inside the lock above?
          cleanDataForNode(failedNodeID);
-
-         if (!keepOldFailoverModel)
-         {
-            notification = new ClusterNotification(ClusterNotification.TYPE_NODE_FAILEDOVER,
-                                                   failedNodeID.intValue(),
-                                                   null);
-
-            clusterNotifier.sendNotification(notification);
-         }
       }
 
       log.debug(this + " announcing that failover procedure is complete");