[jboss-cvs] JBossAS SVN: r66969 - in trunk/cluster/src/main/org/jboss/invocation/unified: server and 1 other directory.

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

Author: galder.zamarreno at jboss.com
Date: 2007-11-12 14:03:54 -0500 (Mon, 12 Nov 2007)
New Revision: 66969

Modified:
   trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
   trunk/cluster/src/main/org/jboss/invocation/unified/server/UnifiedInvokerHA.java
Log:
[JBAS-4950] invocationHasReachedAServer now called after every succesful invocation, plus added a convenience factory method in unified invoker proxy for testing purposes.

Modified: trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
===================================================================
--- trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2007-11-12 18:11:52 UTC (rev 66968)
+++ trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2007-11-12 19:03:54 UTC (rev 66969)
@@ -46,7 +46,10 @@
 import org.jboss.remoting.InvokerLocator;
 
 /**
+ * Unified invoker implementation for InvokerProxyHA
+ * 
  * @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
@@ -267,6 +270,8 @@
             {
                updateClusterInfo(haResponse.newReplicants, haResponse.currentViewId);
             }
+            
+            invocationHasReachedAServer(invocation);
 
             response = haResponse.response;
             return response;

Modified: trunk/cluster/src/main/org/jboss/invocation/unified/server/UnifiedInvokerHA.java
===================================================================
--- trunk/cluster/src/main/org/jboss/invocation/unified/server/UnifiedInvokerHA.java	2007-11-12 18:11:52 UTC (rev 66968)
+++ trunk/cluster/src/main/org/jboss/invocation/unified/server/UnifiedInvokerHA.java	2007-11-12 19:03:54 UTC (rev 66969)
@@ -40,7 +40,10 @@
 import org.jboss.system.Registry;
 
 /**
+ * Unified invoker implementation for InvokerHA 
+ * 
  * @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 UnifiedInvokerHA extends UnifiedInvoker implements InvokerHA
 {
@@ -89,11 +92,8 @@
          familyName = target.getAssociatedPartition().getPartitionName() + "/" + beanName;
       }
 
-      UnifiedInvokerHAProxy proxy = new UnifiedInvokerHAProxy(getInvoker().getLocator(), getStrictRMIException(),
-                                                              target.getReplicants(),
-                                                              policy, proxyFamilyName, target.getCurrentViewId());
-      return proxy;
-
+      return createProxy(getStrictRMIException(),
+            target.getReplicants(), policy, proxyFamilyName, target.getCurrentViewId());
    }
 
    public void unregisterBean(ObjectName beanName) throws Exception
@@ -196,6 +196,11 @@
       return result;
    }
    
-   
-
+   protected Invoker createProxy(boolean isStrictRMIException,
+         ArrayList targets, LoadBalancePolicy policy,
+         String proxyFamilyName, long viewId)
+   {
+      return new UnifiedInvokerHAProxy(getInvoker().getLocator(), isStrictRMIException,
+            targets, policy, proxyFamilyName, viewId);
+   }
 }
\ No newline at end of file