[jboss-cvs] jboss-cache/src/main/org/jboss/cache/transaction DummyContext.java DummyContextFactory.java DummyTransaction.java DummyTransactionManager.java DummyUserTransaction.java

[Scott M S. <st...@us...>]

  User: starksm 
  Date: 04/12/30 09:08:33

  Modified:    src/main/org/jboss/cache/transaction Tag: Branch_3_2
                        DummyContext.java DummyContextFactory.java
                        DummyTransaction.java DummyTransactionManager.java
                        DummyUserTransaction.java
  Log:
  Merge the 1.2 jboss cache changes from the 4.0 branch with the remoting dependency removed.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.4.4   +0 -0      jboss-cache/src/main/org/jboss/cache/transaction/DummyContext.java
  
  
  
  
  1.2.4.4   +0 -0      jboss-cache/src/main/org/jboss/cache/transaction/DummyContextFactory.java
  
  
  
  
  1.12.2.6  +12 -11    jboss-cache/src/main/org/jboss/cache/transaction/DummyTransaction.java
  
  Index: DummyTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-cache/src/main/org/jboss/cache/transaction/DummyTransaction.java,v
  retrieving revision 1.12.2.5
  retrieving revision 1.12.2.6
  diff -u -r1.12.2.5 -r1.12.2.6
  --- DummyTransaction.java	14 Sep 2004 05:50:58 -0000	1.12.2.5
  +++ DummyTransaction.java	30 Dec 2004 17:08:32 -0000	1.12.2.6
  @@ -10,7 +10,7 @@
   
   /**
    * @author bela
  - * @version $Revision: 1.12.2.5 $
  + * @version $Revision: 1.12.2.6 $
    *          Date: May 15, 2003
    *          Time: 4:20:17 PM
    */
  @@ -45,18 +45,19 @@
       * @throws SecurityException          If the caller is not allowed to commit this
       *                                    transaction.
       */
  -   public void commit()
  -           throws RollbackException, HeuristicMixedException,
  -           HeuristicRollbackException, SecurityException, SystemException {
  +   public void commit() throws RollbackException, HeuristicMixedException,
  +                               HeuristicRollbackException, SecurityException, SystemException {
   
  -      status=Status.STATUS_COMMITTING;
  +      status=Status.STATUS_PREPARING;
         try {
            boolean outcome=notifyBeforeCompletion();
  +         status=Status.STATUS_PREPARED;
            if(outcome == true)
  -            status=Status.STATUS_COMMITTED;
  +            status=Status.STATUS_COMMITTING;
            else
  -            status=Status.STATUS_MARKED_ROLLBACK;
  -         notifyAfterCompletion(status);
  +            status=Status.STATUS_ROLLING_BACK;
  +         notifyAfterCompletion(outcome? Status.STATUS_COMMITTED : Status.STATUS_MARKED_ROLLBACK);
  +         status=outcome? Status.STATUS_COMMITTED : Status.STATUS_MARKED_ROLLBACK;
            if(outcome == false)
               throw new RollbackException();
         }
  @@ -78,12 +79,12 @@
       */
      public void rollback() throws IllegalStateException, SystemException {
         try {
  -         status=Status.STATUS_ROLLEDBACK;
  -         notifyAfterCompletion(status);
  +         status=Status.STATUS_ROLLING_BACK;
  +         notifyAfterCompletion(Status.STATUS_ROLLEDBACK);
         }
         catch(Throwable t) {
  -         status=Status.STATUS_ROLLEDBACK;
         }
  +      status=Status.STATUS_ROLLEDBACK;
   
         // Disassociate tx from thread.
         tm_.setTransaction(null);
  
  
  
  1.10.2.4  +0 -0      jboss-cache/src/main/org/jboss/cache/transaction/DummyTransactionManager.java
  
  Index: DummyTransactionManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-cache/src/main/org/jboss/cache/transaction/DummyTransactionManager.java,v
  retrieving revision 1.10.2.3
  retrieving revision 1.10.2.4
  diff -u -r1.10.2.3 -r1.10.2.4
  --- DummyTransactionManager.java	14 Sep 2004 05:50:58 -0000	1.10.2.3
  +++ DummyTransactionManager.java	30 Dec 2004 17:08:32 -0000	1.10.2.4
  @@ -12,7 +12,7 @@
   
   /**
    * @author bela
  - * @version $Revision: 1.10.2.3 $
  + * @version $Revision: 1.10.2.4 $
    *          Date: May 15, 2003
    *          Time: 4:11:37 PM
    */
  
  
  
  1.3.2.4   +0 -0      jboss-cache/src/main/org/jboss/cache/transaction/DummyUserTransaction.java
  
  Index: DummyUserTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-cache/src/main/org/jboss/cache/transaction/DummyUserTransaction.java,v
  retrieving revision 1.3.2.3
  retrieving revision 1.3.2.4
  diff -u -r1.3.2.3 -r1.3.2.4
  --- DummyUserTransaction.java	14 Sep 2004 05:50:58 -0000	1.3.2.3
  +++ DummyUserTransaction.java	30 Dec 2004 17:08:32 -0000	1.3.2.4
  @@ -8,7 +8,7 @@
   
   /**
    * @author bela
  - * @version $Revision: 1.3.2.3 $
  + * @version $Revision: 1.3.2.4 $
    *          Date: May 15, 2003
    *          Time: 4:20:17 PM
    */