You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/06/23 08:50:45 UTC
cvs commit: jakarta-slide/src/stores/org/apache/slide/store/txfile/rm/impl FileResourceManager.java
ozeigermann 2004/06/22 23:50:45
Modified: src/stores/org/apache/slide/store/txfile/rm/impl
FileResourceManager.java
Log:
Removed dependency on thread which is non sense
Revision Changes Path
1.12 +4 -36 jakarta-slide/src/stores/org/apache/slide/store/txfile/rm/impl/FileResourceManager.java
Index: FileResourceManager.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/txfile/rm/impl/FileResourceManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FileResourceManager.java 10 May 2004 08:12:45 -0000 1.11
+++ FileResourceManager.java 23 Jun 2004 06:50:45 -0000 1.12
@@ -513,10 +513,6 @@
return PREPARE_FAILURE;
}
- if (!Thread.currentThread().equals(context.txThread)) {
- throw new ResourceManagerException(ERR_THREAD_INVALID, txId);
- }
-
synchronized (context) {
sync();
@@ -906,10 +902,6 @@
throw new ResourceManagerException(ERR_NO_TX, txId);
}
- if (!Thread.currentThread().equals(context.txThread)) {
- throw new ResourceManagerException(ERR_THREAD_INVALID, txId);
- }
-
return context;
}
@@ -1262,35 +1254,13 @@
return (globalTransactions.size() == 0);
}
- protected boolean rollbackAllTx() {
- synchronized (globalTransactions) {
- for (Iterator it = globalTransactions.values().iterator(); it.hasNext();) {
- TransactionContext context = (TransactionContext) it.next();
- logger.logInfo("Stopping " + context.txId);
- context.txThread.interrupt();
- }
- return rollBackOrForward();
- }
- }
-
- protected void stopAllTx() {
- synchronized (globalTransactions) {
- for (Iterator it = globalTransactions.values().iterator(); it.hasNext();) {
- TransactionContext context = (TransactionContext) it.next();
- logger.logInfo("Killing " + context.txId);
- context.txThread.interrupt();
- }
- }
- }
-
protected boolean shutdown(int mode, long timeoutMSecs) {
switch (mode) {
case SHUTDOWN_MODE_NORMAL :
return waitForAllTxToStop(timeoutMSecs);
case SHUTDOWN_MODE_ROLLBACK :
- return rollbackAllTx();
+ return rollBackOrForward();
case SHUTDOWN_MODE_KILL :
- stopAllTx();
return true;
default :
return false;
@@ -1317,7 +1287,6 @@
protected long timeoutMSecs = getDefaultTransactionTimeout();
protected long startTime;
protected long commitTime = -1L;
- protected Thread txThread;
protected boolean isLightWeight = false;
protected boolean readOnly = true;
protected boolean finished = false;
@@ -1329,7 +1298,6 @@
public TransactionContext(Object txId) throws ResourceManagerException {
this.txId = txId;
startTime = System.currentTimeMillis();
- txThread = Thread.currentThread();
}
public Collection getLocks() {
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org