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

[Ben Wang]

  User: bwang   
  Date: 06/07/12 09:35:35

  Modified:    src/org/jboss/cache/aop  PojoCache.java
  Log:
  Port the changes from 1.4 but note that the aop is deprecated already. 2.0 will use src-50
  
  Revision  Changes    Path
  1.25      +4 -2      JBossCache/src/org/jboss/cache/aop/PojoCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/PojoCache.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- PojoCache.java	21 Jun 2006 11:10:57 -0000	1.24
  +++ PojoCache.java	12 Jul 2006 13:35:34 -0000	1.25
  @@ -738,12 +738,14 @@
            if(isTrue == null || !isTrue.booleanValue())
            {
               Transaction tx = getLocalTransaction();
  +            if(tx == null) tx = localTm_.getTransaction();
  +
               if(tx == null)
               {
                  throw new IllegalStateException("PojoCache.registerTxHanlder(). Can't have null tx handle.");
               }
  -            getLocalTransaction().registerSynchronization(
  -                 new PojoTxSynchronizationHandler(getLocalTransaction(), this));
  +            tx.registerSynchronization(
  +                 new PojoTxSynchronizationHandler(tx, this));
   
               hasSynchronizationHandler_.set(Boolean.TRUE);
            }