Author: ozeigermann
Date: Sat Jul 28 14:33:46 2007
New Revision: 560619
URL: http://svn.apache.org/viewvc?view=rev&rev=560619
Log:
Cleared lock manager scope misconception
Modified:
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/AbstractTransactionalResourceManager.java
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/ManageableResourceManager.java
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java
Modified:
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/AbstractTransactionalResourceManager.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/AbstractTransactionalResourceManager.java?view=diff&rev=560619&r1=560618&r2=560619
==============================================================================
---
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/AbstractTransactionalResourceManager.java
(original)
+++
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/AbstractTransactionalResourceManager.java
Sat Jul 28 14:33:46 2007
@@ -32,7 +32,7 @@
implements ManageableResourceManager {
protected ThreadLocal<T> activeTx = new ThreadLocal<T>();
- private LockManager<Object, String> lm;
+ private LockManager<Object, Object> lm;
private String name;
@@ -47,7 +47,7 @@
// can be used to share a lock manager with other transactinal resource
// managers
- public AbstractTransactionalResourceManager(String name,
LockManager<Object, String> lm) {
+ public AbstractTransactionalResourceManager(String name,
LockManager<Object, Object> lm) {
this.name = name;
this.lm = lm;
}
@@ -107,7 +107,7 @@
}
return txContext;
}
-
+
protected void setActiveTx(T txContext) {
activeTx.set(txContext);
}
@@ -122,19 +122,7 @@
private boolean markedForRollback = false;
- private LockManager<Object, String> lm;
-
- public AbstractTxContext() {
- }
-
- public LockManager<Object, String> getLm() {
- if (this.lm != null) return this.lm;
- else return AbstractTransactionalResourceManager.this.lm;
- }
-
-
- public void join(LockManager lm) {
- this.lm = lm;
+ public void join() {
}
public void start(long timeout, TimeUnit unit) {
@@ -172,17 +160,21 @@
public void commit() {
}
-
+
public boolean prepare() {
return true;
}
+
}
- public LockManager<Object, String> getLm() {
+ protected LockManager<Object, Object> getLm() {
return lm;
}
- public void setLm(LockManager<Object, String> lm) {
+ public void setLm(LockManager<Object, Object> lm) {
+ if (this.lm != null) {
+ throw new IllegalStateException("You can set the lock manager only
once!");
+ }
this.lm = lm;
}
@@ -193,7 +185,7 @@
public void setName(String name) {
this.name = name;
}
-
+
public abstract boolean commitCanFail();
@Override
@@ -202,8 +194,9 @@
throw new IllegalStateException("Active thread " +
Thread.currentThread()
+ " already associated with a transaction!");
}
+ setLm(lm);
T txContext = createContext();
- txContext.join(lm);
+ txContext.join();
setActiveTx(txContext);
}
@@ -219,9 +212,7 @@
public boolean prepareTransaction() {
T txContext = getCheckedActiveTx();
return txContext.prepare();
-
- }
-
+ }
}
Modified:
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/ManageableResourceManager.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/ManageableResourceManager.java?view=diff&rev=560619&r1=560618&r2=560619
==============================================================================
---
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/ManageableResourceManager.java
(original)
+++
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/ManageableResourceManager.java
Sat Jul 28 14:33:46 2007
@@ -41,6 +41,6 @@
public boolean isReadOnlyTransaction();
- public void joinTransaction(LockManager lm);
+ public void joinTransaction(LockManager<Object, Object> lm);
}
Modified:
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java?view=diff&rev=560619&r1=560618&r2=560619
==============================================================================
---
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java
(original)
+++
jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/TransactionImpl.java
Sat Jul 28 14:33:46 2007
@@ -60,7 +60,7 @@
} catch (Exception e) {
throw new TransactionException(e,
TransactionException.Code.COMMIT_FAILED);
} catch (Error e) {
- // is this really a good idea?
+ // XXX is this really a good idea?
rollback();
throw e;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
