[jboss-svn-commits] JBL Code SVN: r6436 - in labs/jbosstm/trunk: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca

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

Author: mark.little at jboss.com
Date: 2006-09-27 05:54:35 -0400 (Wed, 27 Sep 2006)
New Revision: 6436

Modified:
   labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java
   labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java
Log:
Fixed bug in JCA recover (NPE). http://jira.jboss.com/jira/browse/JBTM-135

Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java	2006-09-26 16:01:06 UTC (rev 6435)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/jca/XATerminatorImple.java	2006-09-27 09:54:35 UTC (rev 6436)
@@ -187,7 +187,7 @@
 	
 	/**
 	 * Return a list of indoubt transactions. This may include those
-	 * transactions that are currently in-flight and do not need recovery
+	 * transactions that are currently in-flight and running 2PC and do not need recovery
 	 * invoked on them.
 	 * 
 	 * @param flag either XAResource.TMSTARTRSCAN to indicate the start of
@@ -224,11 +224,11 @@
 		try
 		{
 			ObjectStore objStore = new ObjectStore(TxControl.getActionStoreType());
-			InputObjectState states = null;
+			InputObjectState states = new InputObjectState();
 			
 			// only look in the JCA section of the object store
 			
-			if (objStore.allObjUids(SubordinateAtomicAction.getType(), states) && (states != null))
+			if (objStore.allObjUids(SubordinateAtomicAction.getType(), states) && (states.notempty()))
 			{
 				Stack values = new Stack();
 				boolean finished = false;

Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java	2006-09-26 16:01:06 UTC (rev 6435)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/jca/XATerminatorImple.java	2006-09-27 09:54:35 UTC (rev 6436)
@@ -184,11 +184,11 @@
 		try
 		{
 			ObjectStore objStore = new ObjectStore(TxControl.getActionStoreType());
-			InputObjectState states = null;
+			InputObjectState states = new InputObjectState();
 			
 			// only look in the JCA section of the object store
 			
-			if (objStore.allObjUids(ServerTransaction.getType(), states) && (states != null))
+			if (objStore.allObjUids(ServerTransaction.getType(), states) && (states.notempty()))
 			{
 				Stack values = new Stack();
 				boolean finished = false;