Author: ozeigermann Date: Mon Jul 23 13:55:13 2007 New Revision: 558859 URL: http://svn.apache.org/viewvc?view=rev&rev=558859 Log: Minor cleanup
Modified: 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/memory/BasicTxMap.java jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/OptimisticTxMap.java jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/PessimisticTxMap.java 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=558859&r1=558858&r2=558859 ============================================================================== --- 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 Mon Jul 23 13:55:13 2007 @@ -18,10 +18,11 @@ import org.apache.commons.transaction.locking.LockManager; - public interface ManageableResourceManager extends TransactionalResourceManager { void setRollbackOnly(); + boolean commitCanFail(); + /** * Checks whether this transaction has been marked to allow a rollback as * the only valid outcome. This can be set my method @@ -36,11 +37,8 @@ */ public boolean isTransactionMarkedForRollback(); - public boolean isReadOnlyTransaction(); - - public void joinTransaction(LockManager lm); - + public void joinTransaction(LockManager lm); } Modified: jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/BasicTxMap.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/BasicTxMap.java?view=diff&rev=558859&r1=558858&r2=558859 ============================================================================== --- jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/BasicTxMap.java (original) +++ jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/BasicTxMap.java Mon Jul 23 13:55:13 2007 @@ -26,9 +26,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.transaction.AbstractTransactionalResourceManager; -import org.apache.commons.transaction.TransactionalResourceManager; import org.apache.commons.transaction.AbstractTransactionalResourceManager.AbstractTxContext; -import org.apache.commons.transaction.locking.LockManager; /** * Wrapper that adds transactional control to all kinds of maps that implement Modified: jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/OptimisticTxMap.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/OptimisticTxMap.java?view=diff&rev=558859&r1=558858&r2=558859 ============================================================================== --- jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/OptimisticTxMap.java (original) +++ jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/OptimisticTxMap.java Mon Jul 23 13:55:13 2007 @@ -25,9 +25,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.commons.transaction.TransactionalResourceManager; import org.apache.commons.transaction.locking.LockException; -import org.apache.commons.transaction.locking.LockManager; /** * Wrapper that adds transactional control to all kinds of maps that implement Modified: jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/PessimisticTxMap.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/PessimisticTxMap.java?view=diff&rev=558859&r1=558858&r2=558859 ============================================================================== --- jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/PessimisticTxMap.java (original) +++ jakarta/commons/proper/transaction/branches/TRANSACTION_2/src/java/org/apache/commons/transaction/memory/PessimisticTxMap.java Mon Jul 23 13:55:13 2007 @@ -21,9 +21,6 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.transaction.TransactionalResourceManager; -import org.apache.commons.transaction.locking.LockManager; - /** * Wrapper that adds transactional control to all kinds of maps that implement * the [EMAIL PROTECTED] Map} interface. By using pessimistic transaction control (blocking @@ -147,6 +144,7 @@ } } + @Override public boolean commitCanFail() { return false; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]