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

[jmcnally]

jmcnally    2002/06/04 14:22:03

  Modified:    src/java/org/apache/torque/manager AbstractBaseManager.java
  Log:
  allow objects to be cached under any Serializable key.  Not just an ObjectKey.
  
  Revision  Changes    Path
  1.6       +12 -4     
jakarta-turbine-torque/src/java/org/apache/torque/manager/AbstractBaseManager.java
  
  Index: AbstractBaseManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/manager/AbstractBaseManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractBaseManager.java  15 Apr 2002 16:24:06 -0000      1.5
  +++ AbstractBaseManager.java  4 Jun 2002 21:22:03 -0000       1.6
  @@ -80,7 +80,7 @@
    * instantiating OM's.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
  - * @version $Id: AbstractBaseManager.java,v 1.5 2002/04/15 16:24:06 kschrader Exp $
  + * @version $Id: AbstractBaseManager.java,v 1.6 2002/06/04 21:22:03 jmcnally Exp $
    */
   public abstract class AbstractBaseManager
       implements Serializable
  @@ -195,7 +195,7 @@
           return om;
       }
   
  -    protected Persistent cacheGet(ObjectKey key)
  +    protected Persistent cacheGet(Serializable key)
       {
           Persistent om = null;
           if (cache != null)
  @@ -235,7 +235,7 @@
       }
   
   
  -    protected Persistent removeInstanceImpl(ObjectKey key)
  +    protected Persistent removeInstanceImpl(Serializable key)
           throws TorqueException
       {
           Persistent oldOm = null;
  @@ -269,9 +269,18 @@
           return oldOm;
       }
   
  +
       protected Persistent putInstanceImpl(Persistent om)
           throws TorqueException
       {
  +        ObjectKey key = om.getPrimaryKey();
  +        return putInstanceImpl(key, om);
  +    }
  +
  +
  +    protected Persistent putInstanceImpl(Serializable key, Persistent om)
  +        throws TorqueException
  +    {
           if (getOMClass() != null && !getOMClass().isInstance(om))
           {
               throw new TorqueException(om + "; class=" + om.getClass().getName()
  @@ -287,7 +296,6 @@
                   lockCache = true;
                   try
                   {
  -                    ObjectKey key = om.getPrimaryKey();
                       oldOm = (Persistent)cache.get(key);
                       while (inGet > 0) 
                       {
  
  
  

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