[jboss-cvs] JBoss Messaging SVN: r3416 - branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice.

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

Author: timfox
Date: 2007-12-05 17:49:55 -0500 (Wed, 05 Dec 2007)
New Revision: 3416

Modified:
   branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
Log:
Placeholder for view merging


Modified: branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2007-12-05 19:46:16 UTC (rev 3415)
+++ branches/Branch_Stable/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2007-12-05 22:49:55 UTC (rev 3416)
@@ -38,6 +38,7 @@
 import org.jgroups.Address;
 import org.jgroups.Channel;
 import org.jgroups.MembershipListener;
+import org.jgroups.MergeView;
 import org.jgroups.Message;
 import org.jgroups.MessageListener;
 import org.jgroups.Receiver;
@@ -456,6 +457,11 @@
       {     	
       	log.debug(this  + " got new view " + newView + ", old view is " + currentView);
 		      	
+         if (newView instanceof MergeView)
+         {
+            //TODO handle merging after split-brain
+         }
+      	
          // JGroups will make sure this method is never called by more than one thread concurrently
 
          View oldView = currentView;