[jboss-svn-commits] JBL Code SVN: r27496 - in labs/jbosstm/trunk/ArjunaCore/arjuna: classes/com/arjuna/ats/arjuna and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2009-07-03 08:17:40 -0400 (Fri, 03 Jul 2009)
New Revision: 27496

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java
Log:
https://jira.jboss.org/jira/browse/JBTM-576

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2009-07-03 12:10:17 UTC (rev 27495)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml	2009-07-03 12:17:40 UTC (rev 27496)
@@ -61,7 +61,7 @@
 
                     <!-- these ones should work but dont.
                         Need to investigate why -->
-                    <exclude name="**/LastResource.java"/>
+
                     <exclude name="**/CachedTest.java"/>
                     <exclude name="**/JDBCInventory.java"/>
                     <exclude name="**/LogStoreTest2.java"/>

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java	2009-07-03 12:10:17 UTC (rev 27495)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/LastResourceRecord.java	2009-07-03 12:17:40 UTC (rev 27496)
@@ -188,7 +188,12 @@
 
 	public boolean shouldAdd (AbstractRecord a)
 	{
-            return (a.typeIs() == typeIs()) ;
+	    /*
+	     * OK to add as long as we are the only instance in the list.
+	     * So if we see another record with the same type, barf!
+	     */
+	    
+            return ! (a.typeIs() == typeIs()) ;
 	}
 
 	public boolean shouldMerge (AbstractRecord a)