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

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

Author: mark.little at jboss.com
Date: 2009-12-07 07:58:48 -0500 (Mon, 07 Dec 2009)
New Revision: 30507

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
Log:
https://jira.jboss.org/jira/browse/JBTM-605

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java	2009-12-07 11:33:04 UTC (rev 30506)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/abstractrecords/LastResourceRecord.java	2009-12-07 12:58:48 UTC (rev 30507)
@@ -167,12 +167,18 @@
                     "LastResourceRecord::topLevelPrepare() for " + order());
         }
 
-        if ((_lro != null) && (_lro.commit() == TwoPhaseOutcome.FINISH_OK))
+        if (_lro == null)
+            return TwoPhaseOutcome.PREPARE_NOTOK;
+        
+        switch (_lro.commit())
         {
+        case TwoPhaseOutcome.FINISH_OK:
             return TwoPhaseOutcome.PREPARE_OK;
+        case TwoPhaseOutcome.ONE_PHASE_ERROR:
+            return TwoPhaseOutcome.ONE_PHASE_ERROR;
+        default:
+            return TwoPhaseOutcome.PREPARE_NOTOK;
         }
-        else
-            return TwoPhaseOutcome.PREPARE_NOTOK;
     }
 
     public void print (PrintWriter strm)