[infinispan-commits] Infinispan SVN: r2591 - branches/4.2.x/core/src/main/java/org/infinispan/remoting/transport/jgroups.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-10-25 09:17:18 -0400 (Mon, 25 Oct 2010)
New Revision: 2591

Modified:
   branches/4.2.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
Log:
ISPN-609 - Report Merge events via the listener API


Modified: branches/4.2.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- branches/4.2.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-10-25 12:56:18 UTC (rev 2590)
+++ branches/4.2.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-10-25 13:17:18 UTC (rev 2591)
@@ -463,7 +463,13 @@
       @Override
       public void emitNotification(List<Address> oldMembers, View newView) {
          MergeView mv = (MergeView) newView;
-         notifier.notifyMerge(members, oldMembers, getAddress(), (int) newView.getVid().getId(), needsToRejoin(newView), getSubgroups(mv.getSubgroups()));
+
+         final Address address = getAddress();
+         final int viewId = (int) newView.getVid().getId();
+         final boolean needsRejoin = needsToRejoin(newView);
+         
+         notifier.notifyMerge(members, oldMembers, address, viewId, needsRejoin, getSubgroups(mv.getSubgroups()));
+         notifier.notifyViewChange(members, oldMembers, address, viewId, needsRejoin);
       }
 
       private List<List<Address>> getSubgroups(Vector<View> subviews) {