[Jboss-cvs] JBossAS SVN: r56192 - in trunk/cluster/src/main/org/jboss: ha/framework/interfaces ha/framework/test invocation/http/interfaces invocation/jrmp/interfaces invocation/unified/interfaces
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 23 15:09:01 EDT 2006
Author: bstansberry at jboss.com
Date: 2006-08-23 15:08:58 -0400 (Wed, 23 Aug 2006)
New Revision: 56192
Modified:
trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailable.java
trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailableIdenticalAllProxies.java
trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RandomRobin.java
trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RoundRobin.java
trunk/cluster/src/main/org/jboss/ha/framework/test/ServiceUnavailableClientInterceptor.java
trunk/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java
trunk/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
Log:
[JBAS-3427] FamilyClusterInfo methods should return List, not ArrayList
Modified: trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailable.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailable.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailable.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -21,7 +21,8 @@
*/
package org.jboss.ha.framework.interfaces;
-import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.invocation.Invocation;
/**
@@ -79,7 +80,7 @@
public Object chooseTarget (FamilyClusterInfo clusterFamily, Invocation routingDecision)
{
- ArrayList targets = clusterFamily.getTargets ();
+ List targets = clusterFamily.getTargets ();
if (targets.size () == 0)
return null;
Modified: trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailableIdenticalAllProxies.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailableIdenticalAllProxies.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/ha/framework/interfaces/FirstAvailableIdenticalAllProxies.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -21,7 +21,7 @@
*/
package org.jboss.ha.framework.interfaces;
-import java.util.ArrayList;
+import java.util.List;
import org.jboss.invocation.Invocation;
@@ -65,7 +65,7 @@
public Object chooseTarget (FamilyClusterInfo clusterFamily, Invocation routingDecision)
{
Object target = clusterFamily.getObject ();
- ArrayList targets = clusterFamily.getTargets ();
+ List targets = clusterFamily.getTargets ();
if (targets.size () == 0)
return null;
Modified: trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -27,6 +27,7 @@
import java.io.ObjectOutputStream;
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.List;
import org.jboss.invocation.MarshalledInvocation;
import org.jboss.logging.Logger;
@@ -317,7 +318,7 @@
throws IOException
{
// JBAS-2071 - sync on FCI to ensure targets and vid are consistent
- ArrayList currentTargets = null;
+ List currentTargets = null;
long vid = 0;
synchronized (this.familyClusterInfo)
{
Modified: trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RandomRobin.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RandomRobin.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RandomRobin.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -21,7 +21,7 @@
*/
package org.jboss.ha.framework.interfaces;
-import java.util.ArrayList;
+import java.util.List;
import java.util.Random;
import org.jboss.invocation.Invocation;
@@ -63,7 +63,7 @@
}
public Object chooseTarget (FamilyClusterInfo clusterFamily, Invocation routingDecision)
{
- ArrayList targets = clusterFamily.getTargets ();
+ List targets = clusterFamily.getTargets ();
int max = targets.size();
if (max == 0)
Modified: trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RoundRobin.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RoundRobin.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/ha/framework/interfaces/RoundRobin.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -21,7 +21,8 @@
*/
package org.jboss.ha.framework.interfaces;
-import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.invocation.Invocation;
/**
@@ -60,7 +61,7 @@
public Object chooseTarget (FamilyClusterInfo clusterFamily, Invocation routingDecision)
{
int cursor = clusterFamily.getCursor ();
- ArrayList targets = clusterFamily.getTargets ();
+ List targets = clusterFamily.getTargets ();
if (targets.size () == 0)
return null;
Modified: trunk/cluster/src/main/org/jboss/ha/framework/test/ServiceUnavailableClientInterceptor.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/test/ServiceUnavailableClientInterceptor.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/ha/framework/test/ServiceUnavailableClientInterceptor.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -25,8 +25,8 @@
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
@@ -90,7 +90,7 @@
// Clear the targets to simulate exhausting them all
FamilyClusterInfo info = ClusteringTargetsRepository.getFamilyClusterInfo(proxyFamilyName);
- ArrayList targets = info.getTargets();
+ List targets = info.getTargets();
for (Iterator it = targets.iterator(); it.hasNext(); )
info.removeDeadTarget(it.next());
Modified: trunk/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java
===================================================================
--- trunk/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -29,6 +29,7 @@
import java.net.URL;
import java.rmi.ServerException;
import java.util.ArrayList;
+import java.util.List;
import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
import org.jboss.ha.framework.interfaces.GenericClusteringException;
@@ -143,7 +144,7 @@
{
if( familyClusterInfo != null )
{
- ArrayList targets = familyClusterInfo.removeDeadTarget(target);
+ List targets = familyClusterInfo.removeDeadTarget(target);
if( trace )
{
log.trace("removeDeadTarget("+target+"), targets.size="+targets.size());
@@ -248,7 +249,7 @@
throws IOException
{
// JBAS-2071 - sync on FCI to ensure targets and vid are consistent
- ArrayList currentTargets = null;
+ List currentTargets = null;
long vid = 0;
synchronized (this.familyClusterInfo)
{
Modified: trunk/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
===================================================================
--- trunk/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -30,6 +30,7 @@
import java.rmi.ServerException;
import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.WeakHashMap;
import javax.transaction.TransactionRolledbackException;
@@ -333,7 +334,7 @@
throws IOException
{
// JBAS-2071 - sync on FCI to ensure targets and vid are consistent
- ArrayList targets = null;
+ List targets = null;
long vid = 0;
synchronized (this.familyClusterInfo)
{
Modified: trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
===================================================================
--- trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java 2006-08-23 18:55:34 UTC (rev 56191)
+++ trunk/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java 2006-08-23 19:08:58 UTC (rev 56192)
@@ -397,7 +397,7 @@
out.writeUTF(getLocator().getOriginalURI());
out.writeBoolean(isStrictRMIException());
// JBAS-2071 - sync on FCI to ensure targets and vid are consistent
- ArrayList targets = null;
+ List targets = null;
long vid = 0;
synchronized (this.familyClusterInfo)
{
More information about the jboss-cvs-commits
mailing list