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

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

Author: bstansberry at jboss.com
Date: 2008-01-28 22:49:24 -0500 (Mon, 28 Jan 2008)
New Revision: 69422

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

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-01-29 03:27:27 UTC (rev 69421)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulClusterProxyFactory.java	2008-01-29 03:49:24 UTC (rev 69422)
@@ -186,7 +186,8 @@
    
    public synchronized void replicantsChanged (String key, 
          List newReplicants, 
-         int newReplicantsViewId)
+         int newReplicantsViewId,
+         boolean merge)
    {
       try
       {

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-01-29 03:27:27 UTC (rev 69421)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessClusterProxyFactory.java	2008-01-29 03:49:24 UTC (rev 69422)
@@ -171,7 +171,8 @@
    
    public synchronized void replicantsChanged (String key, 
          List newReplicants, 
-         int newReplicantsViewId)
+         int newReplicantsViewId,
+         boolean merge)
    {
       try
       {