[jboss-svn-commits] JBL Code SVN: r31471 - labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator.

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

Author: mark.little at jboss.com
Date: 2010-02-06 11:28:25 -0500 (Sat, 06 Feb 2010)
New Revision: 31471

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordListIterator.java
Log:
https://jira.jboss.org/jira/browse/JBTM-699

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java	2010-02-06 16:27:16 UTC (rev 31470)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java	2010-02-06 16:28:25 UTC (rev 31471)
@@ -247,19 +247,25 @@
 	{
 	    if (listHead == oldRecord)
 	    {
-		listHead = oldRecord.getNext();
+		listHead = listHead.getNext();
 
 		if (listHead != null)
 		    listHead.setPrevious(null);
+
+		oldRecord.setNext(null);
+		oldRecord.setPrevious(null);
 	    }
 	    else
 	    {
 		if (listTail == oldRecord)
 		{
-		    listTail = oldRecord.getPrevious();
+		    listTail = listTail.getPrevious();
 
 		    if (listTail != null)
 			listTail.setNext(null);
+		    
+		    oldRecord.setNext(null);
+		    oldRecord.setPrevious(null);
 		}
 		else
 		{

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordListIterator.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordListIterator.java	2010-02-06 16:27:16 UTC (rev 31470)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordListIterator.java	2010-02-06 16:28:25 UTC (rev 31471)
@@ -44,7 +44,7 @@
 
     public RecordListIterator (RecordList R)
     {
-	curElem = null;
+	curElem = R.listHead;
 	curList = R;
     }
     
@@ -59,12 +59,12 @@
 
     public final synchronized AbstractRecord iterate ()
     {
-	if (curElem == null)
-	    curElem = curList.listHead;
-	else
+        AbstractRecord ret = curElem;
+
+	if (curElem != null)
 	    curElem = curElem.getNext();
-	
-	return curElem;
+
+	return ret;
     }
 
     private AbstractRecord curElem;