[jboss-cvs] JBossAS SVN: r62448 - in branches/JBoss_4_0_1_SP1_CP: cluster/src/main/org/jboss/invocation/jrmp/interfaces and 1 other directories.

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

Author: fnasser at redhat.com
Date: 2007-04-20 16:26:27 -0400 (Fri, 20 Apr 2007)
New Revision: 62448

Modified:
   branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/FamilyClusterInfoImpl.java
   branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
   branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
   branches/JBoss_4_0_1_SP1_CP/connector/src/main/org/jboss/resource/deployment/RARDeployment.java
Log:
Merge of JBAS-2704 one-off branch (ASPATCH-196)

Modified: branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/FamilyClusterInfoImpl.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/FamilyClusterInfoImpl.java	2007-04-20 19:15:05 UTC (rev 62447)
+++ branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/FamilyClusterInfoImpl.java	2007-04-20 20:26:27 UTC (rev 62448)
@@ -43,7 +43,7 @@
    protected FamilyClusterInfoImpl (String familyName, ArrayList targets, long viewId)
    {
       this.familyName = familyName;
-      this.targets = targets;
+      this.targets = (ArrayList) targets.clone();
       this.currentViewId = viewId;
       
       this.isViewMembersInSyncWithViewId = false;
@@ -54,7 +54,7 @@
    // FamilyClusterInfo implementation ----------------------------------------------
    
    public String getFamilyName () { return this.familyName; }      
-   public ArrayList getTargets () { return this.targets; }
+   public synchronized ArrayList getTargets () { return this.targets; }
    public long getCurrentViewId () { return this.currentViewId; }
    public int getCursor () { return this.cursor; }
    public int setCursor (int cursor) { return (this.cursor = cursor);}
@@ -65,7 +65,9 @@
    {
       synchronized (this)
       {
-         this.targets.remove (target);
+         ArrayList tmp = (ArrayList) targets.clone();
+         tmp.remove (target);
+         this.targets = tmp;
          this.isViewMembersInSyncWithViewId = false;         
       }
       return this.targets;
@@ -75,7 +77,7 @@
    {
       synchronized (this)
       {
-         this.targets = targets;
+         this.targets = (ArrayList) targets.clone();
          this.currentViewId = viewId;
          this.isViewMembersInSyncWithViewId = true;
       }
@@ -137,4 +139,4 @@
    
    // Inner classes -------------------------------------------------
    
-}
+}
\ No newline at end of file

Modified: branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java	2007-04-20 19:15:05 UTC (rev 62447)
+++ branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/ha/framework/interfaces/HARMIClient.java	2007-04-20 20:26:27 UTC (rev 62448)
@@ -243,7 +243,6 @@
       throws IOException
    {
       ArrayList currentTargets = this.familyClusterInfo.getTargets ();
-      currentTargets.trimToSize ();
       long vid = this.familyClusterInfo.getCurrentViewId ();
       
       stream.writeUTF(key);
@@ -253,4 +252,4 @@
       
    }
    
-}
+}
\ No newline at end of file

Modified: branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java	2007-04-20 19:15:05 UTC (rev 62447)
+++ branches/JBoss_4_0_1_SP1_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java	2007-04-20 20:26:27 UTC (rev 62448)
@@ -13,6 +13,7 @@
 import java.rmi.MarshalledObject;
 import java.rmi.RemoteException;
 import java.rmi.ServerException;
+import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.WeakHashMap;
@@ -255,6 +256,10 @@
             {                  
                throw (TransactionRolledbackException) e.detail;
             }
+            if (e.detail instanceof RemoteException)
+            {
+               throw (RemoteException) e.detail;
+            }
             throw e;
          }
          catch (Exception e)
@@ -299,7 +304,6 @@
    {
       ArrayList targets = this.familyClusterInfo.getTargets();
       long vid = this.familyClusterInfo.getCurrentViewId ();
-      targets.trimToSize();
       out.writeObject(targets);
       out.writeObject(this.loadBalancePolicy);
       out.writeObject (this.proxyFamilyName);
@@ -330,4 +334,4 @@
    // Private -------------------------------------------------------
 
    // Inner classes -------------------------------------------------
-}
+}
\ No newline at end of file

Modified: branches/JBoss_4_0_1_SP1_CP/connector/src/main/org/jboss/resource/deployment/RARDeployment.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/connector/src/main/org/jboss/resource/deployment/RARDeployment.java	2007-04-20 19:15:05 UTC (rev 62447)
+++ branches/JBoss_4_0_1_SP1_CP/connector/src/main/org/jboss/resource/deployment/RARDeployment.java	2007-04-20 20:26:27 UTC (rev 62448)
@@ -29,6 +29,7 @@
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.resource.metadata.ConfigPropertyMetaData;
 import org.jboss.resource.metadata.ConnectorMetaData;
+import org.jboss.resource.metadata.DescriptionGroupMetaData;
 import org.jboss.resource.metadata.MessageListenerMetaData;
 import org.jboss.system.ServiceDynamicMBeanSupport;
 
@@ -111,7 +112,10 @@
    
    protected String getInternalDescription()
    {
-      String description = cmd.getDescription().getDescription();
+      String description = null;
+      DescriptionGroupMetaData dgmd = cmd.getDescription();
+      if (dgmd != null)
+         description = dgmd.getDescription();
       if (description == null)
          description = "RAR Deployment " + di.url;
       return description;