You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by oz...@apache.org on 2004/06/05 18:36:02 UTC
cvs commit: jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory OptimisticMapWrapper.java
ozeigermann 2004/06/05 09:36:02
Modified: transaction/src/java/org/apache/commons/transaction/memory
OptimisticMapWrapper.java
Log:
- Adapted to TxContext changes
- Added cleanup code in case tx context gets garbage collected
Revision Changes Path
1.5 +12 -6 jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory/OptimisticMapWrapper.java
Index: OptimisticMapWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory/OptimisticMapWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OptimisticMapWrapper.java 3 Jun 2004 21:07:53 -0000 1.4
+++ OptimisticMapWrapper.java 5 Jun 2004 16:36:02 -0000 1.5
@@ -55,7 +55,7 @@
/**
* Creates a new optimistic transactional map wrapper. Temporary maps and sets to store transactional
- * data will be instances of {@link HashMap} and {@link HashSet}.
+ * data will be instances of {@link java.util.HashMap} and {@link java.util.HashSet}.
*
* @param wrapped map to be wrapped
*/
@@ -104,7 +104,7 @@
"Active thread " + Thread.currentThread() + " not associated with a transaction!");
}
- if (txContext.rollbackOnly) {
+ if (txContext.status == STATUS_MARKED_ROLLBACK) {
throw new IllegalStateException("Active thread " + Thread.currentThread() + " is marked for rollback!");
}
@@ -279,6 +279,12 @@
mapFactory.disposeMap(externalAdds);
externalAdds = null;
}
+
+ protected void finalize() throws Throwable {
+ activeTransactions.remove(this);
+ super.finalize();
+ }
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org