juergen 01/08/30 08:12:14
Modified: src/share/org/apache/slide/common AbstractService.java
Log:
very minor change.
Revision Changes Path
1.4 +31 -31
jakarta-slide/src/share/org/apache/slide/common/AbstractService.java
Index: AbstractService.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/AbstractService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractService.java 2001/07/21 13:13:08 1.3
+++ AbstractService.java 2001/08/30 15:12:13 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/AbstractService.java,v 1.3
2001/07/21 13:13:08 dirkv Exp $
- * $Revision: 1.3 $
- * $Date: 2001/07/21 13:13:08 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/AbstractService.java,v 1.4
2001/08/30 15:12:13 juergen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/08/30 15:12:13 $
*
* ====================================================================
*
@@ -72,14 +72,14 @@
import org.apache.slide.transaction.SlideTransactionManager;
/**
- * Slide Service abstract implementation with support for multiple
+ * Slide Service abstract implementation with support for multiple
* simultaneous transaction context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author Juergen Pill
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
-public abstract class AbstractService extends AbstractServiceBase
+public abstract class AbstractService extends AbstractServiceBase
implements Service {
@@ -120,9 +120,9 @@
public void commit(Xid xid, boolean onePhase)
throws XAException {
- ContextTuple currentContextTuple =
+ ContextTuple currentContextTuple =
(ContextTuple) currentContexts.get(Thread.currentThread());
- Xid currentContext =
+ Xid currentContext =
currentContextTuple!=null?currentContextTuple.getXid():null;
if (currentContext == null)
@@ -135,8 +135,8 @@
if (!onePhase && currentContextTuple.getStatus() != TX_PREPARED)
throw new XAException(XAException.XAER_PROTO);
- if (onePhase &&
- (!((currentContextTuple.getStatus() == TX_IDLE) ||
+ if (onePhase &&
+ (!((currentContextTuple.getStatus() == TX_IDLE) ||
(currentContextTuple.getStatus() == TX_SUSPENDED))))
throw new XAException(XAException.XAER_PROTO);
@@ -173,9 +173,9 @@
public void end(Xid xid, int flags)
throws XAException {
- ContextTuple currentContextTuple =
+ ContextTuple currentContextTuple =
(ContextTuple) currentContexts.get(Thread.currentThread());
- Xid currentContext =
+ Xid currentContext =
currentContextTuple!=null?currentContextTuple.getXid():null;
if (currentContext == null)
@@ -207,9 +207,9 @@
public void forget(Xid xid)
throws XAException {
- ContextTuple currentContextTuple =
+ ContextTuple currentContextTuple =
(ContextTuple) currentContexts.get(Thread.currentThread());
- Xid currentContext =
+ Xid currentContext =
currentContextTuple!=null?currentContextTuple.getXid():null;
if (currentContext == null)
@@ -283,9 +283,9 @@
public int prepare(Xid xid)
throws XAException {
- ContextTuple currentContextTuple =
+ ContextTuple currentContextTuple =
(ContextTuple) currentContexts.get(Thread.currentThread());
- Xid currentContext =
+ Xid currentContext =
currentContextTuple!=null?currentContextTuple.getXid():null;
if (currentContext == null)
@@ -296,7 +296,7 @@
!= xid.getGlobalTransactionId())
throw new XAException(XAException.XAER_PROTO);
- if (!((currentContextTuple.getStatus() == TX_IDLE) ||
+ if (!((currentContextTuple.getStatus() == TX_IDLE) ||
(currentContextTuple.getStatus() == TX_SUSPENDED)))
throw new XAException(XAException.XAER_PROTO);
@@ -332,14 +332,14 @@
public Xid[] recover(int flag)
throws XAException {
- ContextTuple currentContextTuple =
+ ContextTuple currentContextTuple =
(ContextTuple) currentContexts.get(Thread.currentThread());
- Xid currentContext =
+ Xid currentContext =
currentContextTuple!=null?currentContextTuple.getXid():null;
Vector list = new Vector();
- if ((currentContextTuple.getStatus() == TX_PREPARED) &&
+ if ((currentContextTuple.getStatus() == TX_PREPARED) &&
(currentContext != null))
list.addElement(currentContext);
@@ -358,9 +358,9 @@
public void rollback(Xid xid)
throws XAException {
- ContextTuple currentContextTuple =
+ ContextTuple currentContextTuple =
(ContextTuple) currentContexts.get(Thread.currentThread());
- Xid currentContext =
+ Xid currentContext =
currentContextTuple!=null?currentContextTuple.getXid():null;
if (currentContext == null)
@@ -387,7 +387,7 @@
*/
public boolean setTransactionTimeout(int seconds)
throws XAException {
-
+
((ContextTuple) currentContexts.get(Thread.currentThread()))
.setTransactionTimeout(seconds);
return true;
@@ -414,9 +414,9 @@
public void start(Xid xid, int flags)
throws XAException {
- ContextTuple currentContextTuple =
+ ContextTuple currentContextTuple =
(ContextTuple) currentContexts.get(Thread.currentThread());
- Xid currentContext =
+ Xid currentContext =
currentContextTuple!=null?currentContextTuple.getXid():null;
if (xid == null)
@@ -434,8 +434,8 @@
// is the idle status really ok ???
currentContexts.put
(Thread.currentThread(),new ContextTuple
- (xid, TX_IDLE,
- SlideTransactionManager.DEFAULT_TRANSACTION_TIMEOUT,
+ (xid, TX_IDLE,
+ SlideTransactionManager.DEFAULT_TRANSACTION_TIMEOUT,
false));
break;
case XAResource.TMJOIN:
@@ -468,12 +468,12 @@
private int status;
private int transactionTimeout;
private boolean rollbackOnly;
- public ContextTuple(Xid xid, int status, int transactionTimeout,
+ public ContextTuple(Xid xid, int status, int transactionTimeout,
boolean rollbackOnly) {
this.xid = xid;
- this.status = status;
- this.transactionTimeout = transactionTimeout;
- this.rollbackOnly = rollbackOnly;
+ setStatus(status);
+ setTransactionTimeout(transactionTimeout);
+ setRollbackOnly(rollbackOnly);
}
public Xid getXid() {
return xid;
