[jboss-cvs] JBossCache/src/org/jboss/cache/transaction ...

[Manik Surtani]

  User: msurtani
  Date: 07/05/23 06:28:49

  Modified:    src/org/jboss/cache/transaction  
                        TransactionManagerLookup.java DummyTransaction.java
  Log:
  Initiated a bunch of performance fixes, including replacing CopyOnWriteArraySets with org.jboss.cache.util.concurrent.ConcurrentHashSet.
  Also ran an imports optimiser on the code base - there were a lot of unused imports floating about.
  
  Revision  Changes    Path
  1.2       +3 -3      JBossCache/src/org/jboss/cache/transaction/TransactionManagerLookup.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionManagerLookup.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/TransactionManagerLookup.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TransactionManagerLookup.java	7 Feb 2007 22:06:44 -0000	1.1
  +++ TransactionManagerLookup.java	23 May 2007 10:28:49 -0000	1.2
  @@ -1,17 +1,17 @@
   package org.jboss.cache.transaction;
   
  -import javax.transaction.TransactionManager;
  -
   import org.jboss.cache.Cache;
   import org.jboss.cache.config.Configuration;
   
  +import javax.transaction.TransactionManager;
  +
   /**
    * Factory interface, allows {@link Cache} to use different transactional systems.
    * Names of implementors of this class can be configured using
    * {@link Configuration#setTransactionManagerLookupClass}.
    *
    * @author Bela Ban, Aug 26 2003
  - * @version $Id: TransactionManagerLookup.java,v 1.1 2007/02/07 22:06:44 genman Exp $
  + * @version $Id: TransactionManagerLookup.java,v 1.2 2007/05/23 10:28:49 msurtani Exp $
    */
   public interface TransactionManagerLookup
   {
  
  
  
  1.11      +15 -15    JBossCache/src/org/jboss/cache/transaction/DummyTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DummyTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/DummyTransaction.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- DummyTransaction.java	3 Jan 2007 15:33:10 -0000	1.10
  +++ DummyTransaction.java	23 May 2007 10:28:49 -0000	1.11
  @@ -2,6 +2,7 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.jboss.cache.util.concurrent.ConcurrentHashSet;
   
   import javax.transaction.HeuristicMixedException;
   import javax.transaction.HeuristicRollbackException;
  @@ -12,23 +13,23 @@
   import javax.transaction.Transaction;
   import javax.transaction.xa.XAResource;
   import java.util.Set;
  -import java.util.concurrent.CopyOnWriteArraySet;
   
   /**
    * @author bela
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    *          Date: May 15, 2003
    *          Time: 4:20:17 PM
    */
   public class DummyTransaction implements Transaction
   {
  -   int status = Status.STATUS_UNKNOWN;
  -
  -   static final Log log = LogFactory.getLog(DummyTransaction.class);
  -
  +   private int status = Status.STATUS_UNKNOWN;
  +   private static final Log log = LogFactory.getLog(DummyTransaction.class);
      DummyBaseTransactionManager tm_;
   
  -   final Set<Synchronization> participants = new CopyOnWriteArraySet<Synchronization>();
  +   // this is hugely inefficient - modifying a CopyOnWriteArraySet sucks - Manik
  +   //final Set<Synchronization> participants = new CopyOnWriteArraySet<Synchronization>();
  +
  +   private final Set<Synchronization> participants = new ConcurrentHashSet<Synchronization>();
   
      public DummyTransaction(DummyBaseTransactionManager tm)
      {
  @@ -62,7 +63,7 @@
         {
            boolean outcome = notifyBeforeCompletion();
            // status=Status.STATUS_PREPARED;
  -         if (outcome == true && status != Status.STATUS_MARKED_ROLLBACK)
  +         if (outcome && status != Status.STATUS_MARKED_ROLLBACK)
            {
               status = Status.STATUS_COMMITTING;
               doCommit = true;
  @@ -74,8 +75,7 @@
            }
            notifyAfterCompletion(doCommit ? Status.STATUS_COMMITTED : Status.STATUS_MARKED_ROLLBACK);
            status = doCommit ? Status.STATUS_COMMITTED : Status.STATUS_MARKED_ROLLBACK;
  -         if (doCommit == false)
  -            throw new RollbackException("outcome is " + outcome + " status: " + status);
  +         if (!doCommit) throw new RollbackException("outcome is " + outcome + " status: " + status);
         }
         finally
         {