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

[Elias Ross]

  User: genman  
  Date: 06/11/23 14:43:05

  Modified:    src/org/jboss/cache/transaction 
                        DummyTransactionManager.java
  Log:
  JIRA-867 - Fix regression in ActivationInterceptor
  
  Revision  Changes    Path
  1.4       +32 -21    JBossCache/src/org/jboss/cache/transaction/DummyTransactionManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DummyTransactionManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/transaction/DummyTransactionManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- DummyTransactionManager.java	20 Feb 2006 19:34:46 -0000	1.3
  +++ DummyTransactionManager.java	23 Nov 2006 19:43:05 -0000	1.4
  @@ -10,50 +10,61 @@
   
   /**
    * @author bela
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    *          Date: May 15, 2003
    *          Time: 4:11:37 PM
    */
  -public class DummyTransactionManager extends DummyBaseTransactionManager {
  -   static DummyTransactionManager instance=null;
  -   static Log log=LogFactory.getLog(DummyTransactionManager.class);
  +public class DummyTransactionManager extends DummyBaseTransactionManager
  +{
  +   static DummyTransactionManager instance = null;
  +
  +   static Log log = LogFactory.getLog(DummyTransactionManager.class);
  +
      private static final long serialVersionUID = 4396695354693176535L; 
   
  -   public DummyTransactionManager() {
  -      ;
  +   public DummyTransactionManager()
  +   {
      }
   
  -   public static DummyTransactionManager getInstance() {
  -      if(instance == null) {
  -         instance=new DummyTransactionManager();
  -         try {
  -            Properties p=new Properties();
  +   public static DummyTransactionManager getInstance()
  +   {
  +      if (instance == null)
  +      {
  +         instance = new DummyTransactionManager();
  +         try
  +         {
  +            Properties p = new Properties();
               p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
  -            Context ctx=new InitialContext(p);
  +            Context ctx = new InitialContext(p);
               ctx.bind("java:/TransactionManager", instance);
               ctx.bind("UserTransaction", new DummyUserTransaction(instance));
            }
  -         catch(NamingException e) {
  +         catch (NamingException e)
  +         {
               log.error("binding of DummyTransactionManager failed", e);
            }
         }
         return instance;
      }
   
  -   public static void destroy() {
  -      if(instance == null) return;
  -      try {
  -         Properties p=new Properties();
  +   public static void destroy()
  +   {
  +      if (instance == null)
  +         return;
  +      try
  +      {
  +         Properties p = new Properties();
            p.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.cache.transaction.DummyContextFactory");
  -         Context ctx=new InitialContext(p);
  +         Context ctx = new InitialContext(p);
            ctx.unbind("java:/TransactionManager");
            ctx.unbind("UserTransaction");
         }
  -      catch(NamingException e) {
  +      catch (NamingException e)
  +      {
            log.error("unbinding of DummyTransactionManager failed", e);
         }
         instance.setTransaction(null);
  -      instance=null;
  +      instance = null;
      }
   
   }