[jboss-cvs] JBossAS SVN: r69427 - in trunk/ejb3/src/main/org/jboss/ejb3: stateless and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2008-01-28 23:04:52 -0500 (Mon, 28 Jan 2008)
New Revision: 69427

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
   trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
Log:
[JBAS-5183] Provide info as to whether topology changes are due to a merge

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-01-29 04:03:40 UTC (rev 69426)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-01-29 04:04:52 UTC (rev 69427)
@@ -185,7 +185,8 @@
    
    public synchronized void replicantsChanged (String key, 
          List newReplicants, 
-         int newReplicantsViewId)
+         int newReplicantsViewId, 
+         boolean merge)
    {
       try
       {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-01-29 04:03:40 UTC (rev 69426)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-01-29 04:04:52 UTC (rev 69427)
@@ -170,7 +170,8 @@
    
    public synchronized void replicantsChanged (String key, 
          List newReplicants, 
-         int newReplicantsViewId)
+         int newReplicantsViewId, 
+         boolean merge)
    {
       try
       {