[jboss-cvs] JBossAS SVN: r64698 - trunk/cluster/src/main/org/jboss/invocation/unified/interfaces.

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

Author: bstansberry at jboss.com
Date: 2007-08-19 10:17:20 -0400 (Sun, 19 Aug 2007)
New Revision: 64698

Modified:
   trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
Log:
[JBAS-4614] UnifiedInvokerHAProxy should implement InvokerProxyHA
HA invoker proxies expose proxyFamilyName to help tests

Modified: trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
===================================================================
--- trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2007-08-19 14:16:26 UTC (rev 64697)
+++ trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2007-08-19 14:17:20 UTC (rev 64698)
@@ -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;
@@ -47,7 +48,9 @@
 /**
  * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  */
-public class UnifiedInvokerHAProxy extends UnifiedInvokerProxy
+public class UnifiedInvokerHAProxy 
+   extends UnifiedInvokerProxy
+   implements InvokerProxyHA
 {
 
    static final long serialVersionUID = -4813929243402349966L;
@@ -107,6 +110,11 @@
          }
       }
    }
+   
+   public String getProxyFamilyName()
+   {
+      return proxyFamilyName;
+   }
 
    protected int totalNumberOfTargets()
    {
@@ -372,16 +380,19 @@
    }
 
 
-   private void updateClusterInfo(ArrayList newReplicants, long currentViewId)
+   public void updateClusterInfo(ArrayList newReplicants, long currentViewId)
    {
       if(familyClusterInfo != null)
       {
          familyClusterInfo.updateClusterInfo(newReplicants, currentViewId);
-         log.debug("Updating cluster info.  New view id: " + currentViewId);
-         log.debug("New cluster target list is:");
-         for(int x = 0; x < newReplicants.size(); x++)
+         if (log.isTraceEnabled())
          {
-            log.debug(newReplicants.get(x));
+            log.trace("Updating cluster info.  New view id: " + currentViewId);
+            log.trace("New cluster target list is:");
+            for(int x = 0; x < newReplicants.size(); x++)
+            {
+               log.trace(newReplicants.get(x));
+            }
          }
       }
    }