[jboss-cvs] jboss-jms/src/main/org/jboss/jms/tx ...
Timothy Fox
tim.fox at jboss.com
Thu Jul 20 10:04:02 EDT 2006
User: timfox
Date: 06/07/20 10:04:02
Modified: src/main/org/jboss/jms/tx ResourceManager.java
TransactionRequest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-440
Revision Changes Path
1.22 +6 -9 jboss-jms/src/main/org/jboss/jms/tx/ResourceManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ResourceManager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/tx/ResourceManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- ResourceManager.java 17 Jul 2006 17:14:47 -0000 1.21
+++ ResourceManager.java 20 Jul 2006 14:04:02 -0000 1.22
@@ -55,9 +55,9 @@
*
* @author <a href="mailto:Cojonudo14 at hotmail.com">Hiram Chirino</a>
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
- * @version $Revision: 1.21 $
+ * @version $Revision: 1.22 $
*
- * $Id: ResourceManager.java,v 1.21 2006/07/17 17:14:47 timfox Exp $
+ * $Id: ResourceManager.java,v 1.22 2006/07/20 14:04:02 timfox Exp $
*/
public class ResourceManager
{
@@ -176,10 +176,7 @@
//Don't need messages for rollback
tx.clearMessages();
- TransactionRequest request =
- new TransactionRequest(TransactionRequest.ONE_PHASE_ROLLBACK_REQUEST, null, tx);
-
- connection.sendTransaction(request);
+ //For one phase rollback there is nothing to do on the server
redeliverMessages(tx);
}
@@ -252,6 +249,8 @@
if ((tx == null) || tx.getState() == TxState.TX_PREPARED)
{
request = new TransactionRequest(TransactionRequest.TWO_PHASE_ROLLBACK_REQUEST, xid, tx);
+
+ sendTransactionXA(request, connection);
}
else
{
@@ -260,11 +259,9 @@
throw new MessagingXAException(XAException.XAER_NOTA, "Cannot find transaction with xid:" + xid);
}
- request = new TransactionRequest(TransactionRequest.ONE_PHASE_ROLLBACK_REQUEST, xid, tx);
+ //For one phase rollback there is nothing to do on the server
}
- sendTransactionXA(request, connection);
-
try
{
redeliverMessages(tx);
1.10 +3 -5 jboss-jms/src/main/org/jboss/jms/tx/TransactionRequest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransactionRequest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/tx/TransactionRequest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- TransactionRequest.java 29 Apr 2006 02:43:41 -0000 1.9
+++ TransactionRequest.java 20 Jul 2006 14:04:02 -0000 1.10
@@ -42,9 +42,9 @@
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author <a href="mailto:daniel.ramagem at gmail.com">Daniel Bloomfield Ramagem</a>
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*
- * $Id: TransactionRequest.java,v 1.9 2006/04/29 02:43:41 ovidiu Exp $
+ * $Id: TransactionRequest.java,v 1.10 2006/07/20 14:04:02 timfox Exp $
*/
public class TransactionRequest implements Externalizable
{
@@ -53,7 +53,6 @@
private static final long serialVersionUID = -5371388526898322431L;
public final static byte ONE_PHASE_COMMIT_REQUEST = 0;
- public final static byte ONE_PHASE_ROLLBACK_REQUEST = 1;
public final static byte TWO_PHASE_PREPARE_REQUEST = 2;
public final static byte TWO_PHASE_COMMIT_REQUEST = 3;
public final static byte TWO_PHASE_ROLLBACK_REQUEST = 4;
@@ -183,11 +182,10 @@
{
return "TransactionRequest[" +
(requestType == ONE_PHASE_COMMIT_REQUEST ? "ONE_PHASE_COMMIT":
- (requestType == ONE_PHASE_ROLLBACK_REQUEST ? "ONE_PHASE_ROLLBACK":
(requestType == TWO_PHASE_PREPARE_REQUEST ? "TWO_PHASE_PREPARE":
(requestType == TWO_PHASE_COMMIT_REQUEST ? "TWO_PHASE_COMMIT":
(requestType == TWO_PHASE_ROLLBACK_REQUEST ? "TWO_PHASE_ROLLBACK_":
- "UNKNOW_REQUEST_TYPE"))))) + ", " + xid + "]";
+ "UNKNOW_REQUEST_TYPE")))) + ", " + xid + "]";
}
// Package protected ---------------------------------------------
More information about the jboss-cvs-commits
mailing list