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

[Manik Surtani]

  User: msurtani
  Date: 06/12/04 19:01:52

  Modified:    src/org/jboss/cache/aop  Tag: Branch_JBossCache_1_4_0
                        PojoCache.java
  Log:
  ported fixes for JBCACHE-871 and JBCACHE-875 from the 1.3.0 branch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.23.2.3  +18 -15    JBossCache/src/org/jboss/cache/aop/Attic/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/Attic/PojoCache.java,v
  retrieving revision 1.23.2.2
  retrieving revision 1.23.2.3
  diff -u -b -r1.23.2.2 -r1.23.2.3
  --- PojoCache.java	11 Jul 2006 10:09:53 -0000	1.23.2.2
  +++ PojoCache.java	5 Dec 2006 00:01:52 -0000	1.23.2.3
  @@ -6,35 +6,35 @@
    */
   package org.jboss.cache.aop;
   
  -import org.jboss.cache.xml.XmlHelper;
  -import org.jboss.cache.lock.UpgradeException;
  +import org.jboss.aop.InstanceAdvisor;
  +import org.jboss.cache.CacheException;
  +import org.jboss.cache.DataNode;
  +import org.jboss.cache.Fqn;
  +import org.jboss.cache.Node;
  +import org.jboss.cache.RegionNotEmptyException;
  +import org.jboss.cache.TreeCache;
   import org.jboss.cache.aop.eviction.AopEvictionPolicy;
   import org.jboss.cache.aop.util.ObjectUtil;
  +import org.jboss.cache.lock.UpgradeException;
  +import org.jboss.cache.marshall.ObjectSerializationFactory;
   import org.jboss.cache.marshall.Region;
   import org.jboss.cache.marshall.RegionNameConflictException;
  -import org.jboss.cache.marshall.ObjectSerializationFactory;
   import org.jboss.cache.transaction.BatchModeTransactionManager;
  -import org.jboss.cache.TreeCache;
  -import org.jboss.cache.Fqn;
  -import org.jboss.cache.CacheException;
  -import org.jboss.cache.RegionNotEmptyException;
  -import org.jboss.cache.DataNode;
  -import org.jboss.cache.Node;
  -import org.jboss.aop.InstanceAdvisor;
  +import org.jboss.cache.xml.XmlHelper;
   import org.jgroups.JChannel;
   import org.w3c.dom.Element;
   
  +import javax.transaction.RollbackException;
   import javax.transaction.Status;
   import javax.transaction.SystemException;
  -import javax.transaction.TransactionManager;
  -import javax.transaction.RollbackException;
   import javax.transaction.Transaction;
  +import javax.transaction.TransactionManager;
  +import java.lang.reflect.Field;
  +import java.util.ArrayList;
   import java.util.Iterator;
  +import java.util.List;
   import java.util.Map;
   import java.util.WeakHashMap;
  -import java.util.List;
  -import java.util.ArrayList;
  -import java.lang.reflect.Field;
   
   /**
    * PojoCache implementation class. User should use the {@link PojoCacheIfc} interface directly to
  @@ -216,6 +216,9 @@
         boolean sendNodeEvent = false;
         // Let's do it brute force.
         _remove(null, fqn, create_undo_ops, sendNodeEvent);
  +
  +      // since this is not in the scope of a tx, do a realRemove() immediately - Manik, 1/Dec/2006 - JBCACHE-871
  +      realRemove(fqn, false);      
      }
   
      /**