cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/om AbstractBaseManager.java

[jmcnally]

jmcnally    02/03/10 21:20:09

  Modified:    src/java/org/apache/torque/om AbstractBaseManager.java
  Log:
  return the old object in the cache if we are overwriting it.
  
  Revision  Changes    Path
  1.4       +7 -3      
jakarta-turbine-torque/src/java/org/apache/torque/om/AbstractBaseManager.java
  
  Index: AbstractBaseManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/AbstractBaseManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractBaseManager.java  6 Mar 2002 15:14:10 -0000       1.3
  +++ AbstractBaseManager.java  11 Mar 2002 05:20:09 -0000      1.4
  @@ -72,7 +72,7 @@
    * instantiating OM's.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
  - * @version $Id: AbstractBaseManager.java,v 1.3 2002/03/06 15:14:10 mpoeschl Exp $
  + * @version $Id: AbstractBaseManager.java,v 1.4 2002/03/11 05:20:09 jmcnally Exp $
    */
   public abstract class AbstractBaseManager
   {
  @@ -216,7 +216,7 @@
           }
       }
   
  -    protected void putInstanceImpl(Persistent om)
  +    protected Persistent putInstanceImpl(Persistent om)
           throws TorqueException
       {
           if (getOMClass() != null && !getOMClass().isInstance(om))
  @@ -226,6 +226,7 @@
                   getOMClass().getName() + " objects");
           }
   
  +        Persistent oldOm = null;
           if (cache != null)
           {
               synchronized (this)
  @@ -233,7 +234,9 @@
                   lockCache = true;
                   try
                   {
  -                    cache.put(om.getPrimaryKey().toString(), om);
  +                    String key = om.getPrimaryKey().toString();
  +                    oldOm = (Persistent)cache.get(key);
  +                    cache.put(key, om);
                   }
                   catch (CacheException ce)
                   {
  @@ -247,6 +250,7 @@
                   }
               }
           }
  +        return oldOm;
       }
   
       protected abstract Persistent retrieveStoredOM(ObjectKey id)
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>