[jboss-svn-commits] JBL Code SVN: r29482 - in labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model: twophase/arjunacore and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 28 04:56:09 EDT 2009
Author: adinn
Date: 2009-09-28 04:56:09 -0400 (Mon, 28 Sep 2009)
New Revision: 29482
Modified:
labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java
labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java
Log:
modified one phase commit failure handling to use new ONE_PHASE_ERROR return code following changes to meaning of FINSH_ERROR -- fixes for JBTM-605
Modified: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java 2009-09-28 08:42:47 UTC (rev 29481)
+++ labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/sagas/arjunacore/ParticipantRecord.java 2009-09-28 08:56:09 UTC (rev 29482)
@@ -466,7 +466,7 @@
{
// we cannot proceed if the participant has neither completed not exited
- if (isActive()) return TwoPhaseOutcome.FINISH_ERROR;
+ if (isActive()) return TwoPhaseOutcome.ONE_PHASE_ERROR;
try
{
@@ -474,7 +474,7 @@
}
catch (InvalidParticipantException ex)
{
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
}
catch (WrongStateException ex)
{
@@ -499,7 +499,7 @@
return TwoPhaseOutcome.FINISH_OK;
}
else
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
}
catch (Exception ex6)
{
Modified: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java 2009-09-28 08:42:47 UTC (rev 29481)
+++ labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mwlabs/wscf/model/twophase/arjunacore/ParticipantRecord.java 2009-09-28 08:56:09 UTC (rev 29482)
@@ -486,7 +486,7 @@
if (_resourceHandle != null)
{
if (_rolledback)
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
if (_readonly)
return TwoPhaseOutcome.FINISH_OK;
@@ -497,11 +497,11 @@
}
catch (InvalidParticipantException ex)
{
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
}
catch (WrongStateException ex)
{
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
}
catch (HeuristicHazardException ex)
{
@@ -518,7 +518,7 @@
// TODO explicit in the signature
catch (ParticipantCancelledException ex) // a type of SystemException
{
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
}
catch (SystemException ex)
{
@@ -528,7 +528,7 @@
return TwoPhaseOutcome.FINISH_OK;
}
else
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
}
catch (Exception ex6)
{
@@ -537,7 +537,7 @@
ex6.printStackTrace();
- return TwoPhaseOutcome.FINISH_ERROR;
+ return TwoPhaseOutcome.ONE_PHASE_ERROR;
}
}
More information about the jboss-svn-commits
mailing list