[jboss-svn-commits] JBL Code SVN: r37657 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final: ArjunaJTA/jta/classes/com/arjuna/ats/jta/common and 1 other directories.

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

Author: tomjenkinson
Date: 2011-10-21 10:08:24 -0400 (Fri, 21 Oct 2011)
New Revision: 37657

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBeanMBean.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/common/tests/com/arjuna/common/tests/simple/EnvironmentBeanTest.java
Log:
JBTM-895 make sure the tests pass for the getter and setter of the JTA recovery bean

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java	2011-10-21 13:36:44 UTC (rev 37656)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/NodeNameXAResourceOrphanFilter.java	2011-10-21 14:08:24 UTC (rev 37657)
@@ -48,7 +48,7 @@
     @Override
     public Vote checkXid(Xid xid)
     {
-        List<Integer> _xaRecoveryNodes = jtaPropertyManager.getJTAEnvironmentBean().getXaRecoveryNodes();
+        List<Integer> _xaRecoveryNodes = jtaPropertyManager.getJTAEnvironmentBean().getXaRecoveryNodesImpl();
 
         if(_xaRecoveryNodes == null || _xaRecoveryNodes.size() == 0) {
             doWarning();

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java	2011-10-21 13:36:44 UTC (rev 37656)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/SubordinateJTAXAResourceOrphanFilter.java	2011-10-21 14:08:24 UTC (rev 37657)
@@ -49,7 +49,7 @@
 
 	@Override
 	public Vote checkXid(Xid xid) {
-		List<Integer> _xaRecoveryNodes = jtaPropertyManager.getJTAEnvironmentBean().getXaRecoveryNodes();
+		List<Integer> _xaRecoveryNodes = jtaPropertyManager.getJTAEnvironmentBean().getXaRecoveryNodesImpl();
 
 		if (_xaRecoveryNodes == null || _xaRecoveryNodes.size() == 0) {
 			jtaLogger.i18NLogger.info_recovery_noxanodes();

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java	2011-10-21 13:36:44 UTC (rev 37656)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBean.java	2011-10-21 14:08:24 UTC (rev 37657)
@@ -366,7 +366,7 @@
      *
      * @return the set of node identifiers for which to perform recovery.
      */
-    public List<Integer> getXaRecoveryNodes()
+    public List<Integer> getXaRecoveryNodesImpl()
     {
        return new ArrayList<Integer>(xaRecoveryNodes);
     }
@@ -381,21 +381,43 @@
 	public void setXaRecoveryNodes(List<String> xaRecoveryNodes) {
 
 		ArrayList<Integer> arrayList = new ArrayList<Integer>();
-		Iterator<String> iterator = xaRecoveryNodes.iterator();
-		while (iterator.hasNext()) {
-			Integer nodeIdentifier = null;
-			try {
-				nodeIdentifier = Integer.valueOf(iterator.next());
-			} catch (NumberFormatException nfe) {
-				throw new RuntimeException(tsLogger.i18NLogger.get_node_identifier_invalid(nodeIdentifier));
+		if (xaRecoveryNodes != null) {
+			Iterator<String> iterator = xaRecoveryNodes.iterator();
+			while (iterator.hasNext()) {
+				Integer nodeIdentifier = null;
+				try {
+					nodeIdentifier = Integer.valueOf(iterator.next());
+				} catch (NumberFormatException nfe) {
+					throw new RuntimeException(tsLogger.i18NLogger.get_node_identifier_invalid(nodeIdentifier));
+				}
+				if (nodeIdentifier < 1) {
+					throw new RuntimeException(tsLogger.i18NLogger.get_node_identifier_invalid(nodeIdentifier));
+				}
+				arrayList.add(Integer.valueOf(nodeIdentifier));
 			}
-			if (nodeIdentifier < 1) {
-				throw new RuntimeException(tsLogger.i18NLogger.get_node_identifier_invalid(nodeIdentifier));
-			}
-			arrayList.add(Integer.valueOf(nodeIdentifier));
 		}
 		setXaRecoveryNodesImpl(arrayList);
 	}
+	
+	/**
+     * Returns the set of node identifiers for which recovery will be performed.
+     * The returned list is a copy. May return an empty list, will not return null.
+     *
+     * Default: empty list.
+     * Equivalent deprecated property prefix: com.arjuna.ats.jta.xaRecoveryNode
+     *
+     * @return the set of node identifiers for which to perform recovery.
+     * @deprecated
+     */
+    public List<String> getXaRecoveryNodes()
+    {
+    	List<String> toReturn = new ArrayList<String>();
+    	Iterator<Integer> iterator = xaRecoveryNodes.iterator();
+    	while (iterator.hasNext()) {
+    		toReturn.add(String.valueOf(iterator.next()));
+    	}
+       return toReturn;
+    }
     
 
     /**

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBeanMBean.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBeanMBean.java	2011-10-21 13:36:44 UTC (rev 37656)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/ArjunaJTA/jta/classes/com/arjuna/ats/jta/common/JTAEnvironmentBeanMBean.java	2011-10-21 14:08:24 UTC (rev 37657)
@@ -37,7 +37,7 @@
 
     String getTransactionSynchronizationRegistryClassName();
 
-    List<Integer> getXaRecoveryNodes();
+    List<String> getXaRecoveryNodes();
 
     List<String> getXaResourceRecoveryClassNames();
 

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/common/tests/com/arjuna/common/tests/simple/EnvironmentBeanTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/common/tests/com/arjuna/common/tests/simple/EnvironmentBeanTest.java	2011-10-21 13:36:44 UTC (rev 37656)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/common/tests/com/arjuna/common/tests/simple/EnvironmentBeanTest.java	2011-10-21 14:08:24 UTC (rev 37657)
@@ -105,7 +105,7 @@
         } else {
 
             inputValue = new ArrayList<String>();
-            ((List)inputValue).add("testValue");
+            ((List)inputValue).add("1");
             
         }