cvs commit: jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory TransactionalMapWrapper.java

[ozeigermann]

ozeigermann    2004/05/18 00:40:29

  Modified:    transaction/src/java/org/apache/commons/transaction/memory
                        TransactionalMapWrapper.java
  Log:
  Fixed weird suspend misconception
  
  Revision  Changes    Path
  1.4       +13 -15    
jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory/TransactionalMapWrapper.java
  
  Index: TransactionalMapWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/transaction/src/java/org/apache/commons/transaction/memory/TransactionalMapWrapper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TransactionalMapWrapper.java      17 May 2004 14:49:38 -0000      1.3
  +++ TransactionalMapWrapper.java      18 May 2004 07:40:29 -0000      1.4
  @@ -49,7 +49,6 @@
       protected Map wrapped;
   
       protected ThreadLocal activeTx = new ThreadLocal();
  -    protected TxContext suspendedTx = null;
   
       public TransactionalMapWrapper(Map wrapped) {
           this.wrapped = wrapped;
  @@ -67,7 +66,7 @@
           
       }
   
  -    public synchronized void suspendTransaction() {
  +    public synchronized TxContext suspendTransaction() {
           TxContext txContext = getActiveTx();
   
           if (txContext == null) {
  @@ -76,10 +75,10 @@
           }
   
           activeTx.set(null);
  -        suspendedTx = txContext;
  +        return txContext;
       }
   
  -    public synchronized void resumeTransaction() {
  +    public synchronized void resumeTransaction(TxContext suspendedTx) {
           if (getActiveTx() != null) {
               throw new IllegalStateException(
                   "Active thread " + Thread.currentThread() + " already associated 
with a transaction!");
  @@ -90,7 +89,6 @@
           }
   
           activeTx.set(suspendedTx);
  -        suspendedTx = null;
       }
   
       public synchronized void startTransaction() {
  @@ -331,30 +329,30 @@
           return (TxContext) activeTx.get();
       }
   
  -    protected static class TxContext {
  +    public static class TxContext {
           protected final Set deletes;
           protected final Map changes;
           protected boolean rollbackOnly;
   
  -        public TxContext() {
  +        protected TxContext() {
               deletes = new HashSet();
               changes = new HashMap();
               rollbackOnly = false;
           }
   
  -        public Map getChanges() {
  +        protected Map getChanges() {
               return changes;
           }
   
  -        public Set getDeletes() {
  +        protected Set getDeletes() {
               return deletes;
           }
   
  -        public boolean isRollbackOnly() {
  +        protected boolean isRollbackOnly() {
               return rollbackOnly;
           }
   
  -        public void setRollbackOnly(boolean rollbackOnly) {
  +        protected void setRollbackOnly(boolean rollbackOnly) {
               this.rollbackOnly = rollbackOnly;
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]