From: Francisco R. <rev...@im...> - 2005-05-10 01:02:22
|
User: reverbel Date: 05/05/09 21:02:12 Modified: src/main/org/jboss/tm TransactionImpl.java Log: Improve misleading trace-level message. (A rollback vote is not illegal). Revision Changes Path 1.48 +7 -5 jboss-transaction/src/main/org/jboss/tm/TransactionImpl.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TransactionImpl.java =================================================================== RCS file: /cvsroot/jboss/jboss-transaction/src/main/org/jboss/tm/TransactionImpl.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -b -r1.47 -r1.48 --- TransactionImpl.java 6 May 2005 20:18:29 -0000 1.47 +++ TransactionImpl.java 10 May 2005 01:02:12 -0000 1.48 @@ -58,7 +58,7 @@ * @author <a href="mailto:bi...@jb...">Bill Burke</a> * @author <a href="mailto:ad...@jb...">Adrian Brock</a> * @author <a href="mailto:rev...@im...">Francisco Reverbel</a> - * @version $Revision: 1.47 $ + * @version $Revision: 1.48 $ * @see TxManager */ public class TransactionImpl @@ -2012,9 +2012,10 @@ readOnly = false; else if (vote != RS_VOTE_READONLY) { - // Illegal vote: rollback. + // Neither commit vote nor readonly vote: rollback. if (trace) - log.trace("illegal vote in prepare resources tx=" + this + + log.trace("prepareResources got a rollback vote " + + "from an XA resource, tx=" + this + " resource=" + resource, new Exception()); status = Status.STATUS_MARKED_ROLLBACK; return false; @@ -2072,9 +2073,10 @@ readOnly = false; else if (vote != RS_VOTE_READONLY) { - // Illegal vote: rollback. + // Neither commit vote nor readonly vote: rollback. if (trace) - log.trace("illegal vote in prepare resources tx=" + this + + log.trace("prepareResources got a rollback vote " + + "from a remote resource, tx=" + this + " resource=" + resource, new Exception()); status = Status.STATUS_MARKED_ROLLBACK; return false; |