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

[Manik Surtani]

  User: msurtani
  Date: 07/01/08 20:43:09

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  Added tests and fix for JBCACHE-923
  
  Revision  Changes    Path
  1.18      +3 -3      JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- CacheImpl.java	4 Jan 2007 16:17:38 -0000	1.17
  +++ CacheImpl.java	9 Jan 2007 01:43:09 -0000	1.18
  @@ -100,7 +100,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: CacheImpl.java,v 1.17 2007/01/04 16:17:38 msurtani Exp $
  + * @version $Id: CacheImpl.java,v 1.18 2007/01/09 01:43:09 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -2342,7 +2342,7 @@
         {
            try
            {
  -            int status = getTransactionManager().getTransaction().getStatus();
  +            int status = tx_table.getLocalTransaction(tx).getStatus();
               if (status == Status.STATUS_MARKED_ROLLBACK || status == Status.STATUS_ROLLEDBACK || status == Status.STATUS_ROLLING_BACK)
               {
                  log.debug("This remove call is triggered by a transaction rollback, as a compensation operation.  Do a realRemove() instead.");
  @@ -2353,7 +2353,7 @@
            catch (Exception e)
            {
               // what do we do here?
  -            log.trace("Caught exception dealing with transaction manager", e);
  +            log.warn("Unable to get a hold of the transaction for a supposedly transactional call!  This *may* result in stale locks!", e);
            }
         }