[jboss-cvs] JBossAS SVN: r73592 - in branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss: proxy/ejb and 1 other directory.

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

Author: galder.zamarreno at jboss.com
Date: 2008-05-22 10:38:21 -0400 (Thu, 22 May 2008)
New Revision: 73592

Modified:
   branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
   branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/proxy/ejb/ProxyFactoryHA.java
Log:
[JBPAPP-850] Fixed issue adding implements and making updateClusterInfo public. Also added some trace logging for ProxyFactoryHA to help diagnose future issues.

Modified: branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2008-05-22 14:16:16 UTC (rev 73591)
+++ branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2008-05-22 14:38:21 UTC (rev 73592)
@@ -38,6 +38,7 @@
 import org.jboss.ha.framework.interfaces.HARMIResponse;
 import org.jboss.ha.framework.interfaces.LoadBalancePolicy;
 import org.jboss.invocation.Invocation;
+import org.jboss.invocation.InvokerProxyHA;
 import org.jboss.invocation.PayloadKey;
 import org.jboss.invocation.ServiceUnavailableException;
 import org.jboss.remoting.CannotConnectException;
@@ -54,7 +55,9 @@
  * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  */
-public class UnifiedInvokerHAProxy extends UnifiedInvokerProxy
+public class UnifiedInvokerHAProxy 
+   extends UnifiedInvokerProxy 
+   implements InvokerProxyHA
 {
 
    static final long serialVersionUID = -4813929243402349966L;
@@ -441,8 +444,7 @@
       }
    }
 
-
-   private void updateClusterInfo(ArrayList newReplicants, long currentViewId)
+   public void updateClusterInfo(ArrayList newReplicants, long currentViewId)
    {
       if(familyClusterInfo != null)
       {

Modified: branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/proxy/ejb/ProxyFactoryHA.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/proxy/ejb/ProxyFactoryHA.java	2008-05-22 14:16:16 UTC (rev 73591)
+++ branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/proxy/ejb/ProxyFactoryHA.java	2008-05-22 14:38:21 UTC (rev 73592)
@@ -45,6 +45,7 @@
  *
  * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
  * @author Scott.Stark at jboss.org
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  * @version $Revision$
  */
 public class ProxyFactoryHA 
@@ -205,10 +206,18 @@
       {
          if (homeInvoker instanceof InvokerProxyHA)
          {
+            if (log.isTraceEnabled())
+            {
+               log.trace("Updating home proxy with new replicants " + target.getReplicants() + ", view=" + target.getCurrentViewId ());
+            }
             ((InvokerProxyHA)homeInvoker).updateClusterInfo (target.getReplicants(), target.getCurrentViewId ());
          }
          if (beanInvoker instanceof InvokerProxyHA)
          {
+            if (log.isTraceEnabled())
+            {
+               log.trace("Updating bean proxy with new replicants " + target.getReplicants() + ", view=" + target.getCurrentViewId ());
+            }
             ((InvokerProxyHA)beanInvoker).updateClusterInfo (target.getReplicants(), target.getCurrentViewId ());
          }