summaryrefslogtreecommitdiff
path: root/src/main/java/com/amazon/carbonado/txn/TransactionManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/amazon/carbonado/txn/TransactionManager.java')
-rw-r--r--src/main/java/com/amazon/carbonado/txn/TransactionManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/amazon/carbonado/txn/TransactionManager.java b/src/main/java/com/amazon/carbonado/txn/TransactionManager.java
index 528ade5..36d2e22 100644
--- a/src/main/java/com/amazon/carbonado/txn/TransactionManager.java
+++ b/src/main/java/com/amazon/carbonado/txn/TransactionManager.java
@@ -98,7 +98,7 @@ public abstract class TransactionManager<Txn> {
// Called by TransactionScope.
boolean setLocalScope(TransactionScope<Txn> scope, boolean detached) {
TransactionScope<Txn> existing = mLocalScope.get();
- if ((existing == null && detached) || existing == scope) {
+ if (((existing == null || existing.isInactive()) && detached) || existing == scope) {
mLocalScope.set(scope);
return true;
}