[jboss-cvs] JBossAS SVN: r83230 - in branches/Branch_5_x/cluster/src/main/org/jboss: invocation/http/interfaces and 2 other directories.

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

Author: bstansberry at jboss.com
Date: 2009-01-22 00:02:29 -0500 (Thu, 22 Jan 2009)
New Revision: 83230

Modified:
   branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
   branches/Branch_5_x/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java
   branches/Branch_5_x/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
   branches/Branch_5_x/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
Log:
[JBAS-6345] Restore serialization compatibility with 4.x clients

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java	2009-01-22 05:02:02 UTC (rev 83229)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java	2009-01-22 05:02:29 UTC (rev 83230)
@@ -377,15 +377,17 @@
       if( trace )
          log.trace("Init, clusterInfo: "+familyClusterInfo+", policy="+loadBalancePolicy);
    }
+   @SuppressWarnings("unchecked")
    private void writeObject (ObjectOutputStream stream)
       throws IOException
    {
       // JBAS-2071 - sync on FCI to ensure targets and vid are consistent
-      List currentTargets = null;
+      ArrayList currentTargets = null;
       long vid = 0;
       synchronized (this.familyClusterInfo)
       {
-         currentTargets = this.familyClusterInfo.getTargets ();
+         // JBAS-6345 -- write an ArrayList for compatibility with AS 3.x/4.x clients
+         currentTargets = new ArrayList(this.familyClusterInfo.getTargets());
          vid = this.familyClusterInfo.getCurrentViewId ();
       }
       stream.writeUTF(key);

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java	2009-01-22 05:02:02 UTC (rev 83229)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/invocation/http/interfaces/HttpInvokerProxyHA.java	2009-01-22 05:02:29 UTC (rev 83230)
@@ -256,15 +256,17 @@
 
    /** Externalize this instance.
    */
+   @SuppressWarnings("unchecked")
    public void writeExternal(final ObjectOutput out)
       throws IOException
    { 
       // JBAS-2071 - sync on FCI to ensure targets and vid are consistent
-      List currentTargets = null;
+      ArrayList currentTargets = null;
       long vid = 0;
       synchronized (this.familyClusterInfo)
       {
-         currentTargets = this.familyClusterInfo.getTargets ();
+         // JBAS-6345 -- write an ArrayList for compatibility with AS 3.x/4.x clients
+         currentTargets = new ArrayList(this.familyClusterInfo.getTargets());
          vid = this.familyClusterInfo.getCurrentViewId ();
       }
       out.writeObject(currentTargets);

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java	2009-01-22 05:02:02 UTC (rev 83229)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java	2009-01-22 05:02:29 UTC (rev 83230)
@@ -358,11 +358,12 @@
       throws IOException
    { 
       // JBAS-2071 - sync on FCI to ensure targets and vid are consistent
-      List targets = null;
+      ArrayList targets = null;
       long vid = 0;
       synchronized (this.familyClusterInfo)
       {
-         targets = this.familyClusterInfo.getTargets ();
+         // JBAS-6345 -- write an ArrayList for compatibility with AS 3.x/4.x clients
+         targets = new ArrayList(this.familyClusterInfo.getTargets ());
          vid = this.familyClusterInfo.getCurrentViewId ();
       }
       out.writeObject(targets);

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2009-01-22 05:02:02 UTC (rev 83229)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2009-01-22 05:02:29 UTC (rev 83230)
@@ -461,11 +461,12 @@
       out.writeUTF(getLocator().getOriginalURI());
       out.writeBoolean(isStrictRMIException()); 
       // JBAS-2071 - sync on FCI to ensure targets and vid are consistent
-      List targets = null;
+      ArrayList targets = null;
       long vid = 0;
       synchronized (this.familyClusterInfo)
       {
-         targets = this.familyClusterInfo.getTargets ();
+         // JBAS-6345 -- write an ArrayList for compatibility with AS 3.x/4.x clients
+         targets = new ArrayList(this.familyClusterInfo.getTargets ());
          vid = this.familyClusterInfo.getCurrentViewId ();
       }
       out.writeObject(targets);