Return-Path: <brj@apache.org>
Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm
Delivered-To: mailing list ojb-dev@db.apache.org
Received: (qmail 14466 invoked by uid 500); 13 Feb 2003 19:19:22 -0000
Received: (qmail 14457 invoked from network); 13 Feb 2003 19:19:22 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 13 Feb 2003 19:19:22 -0000
Received: (qmail 45394 invoked by uid 1513); 13 Feb 2003 19:19:21 -0000
Date: 13 Feb 2003 19:19:21 -0000
Message-ID: <20030213191921.45393.qmail@icarus.apache.org>
From: brj@apache.org
To: db-ojb-cvs@apache.org
Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/cache
 ObjectCacheDefaultImpl.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

brj         2003/02/13 11:19:21

  Modified:    src/java/org/apache/ojb/broker/cache
                        ObjectCacheDefaultImpl.java
  Log:
  use default Broker to get rid of deprecated Identity constructor
  
  Revision  Changes    Path
  1.6       +14 -3     db-ojb/src/java/org/apache/ojb/broker/cache/ObjectCacheDefaultImpl.java
  
  Index: ObjectCacheDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/ObjectCacheDefaultImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ObjectCacheDefaultImpl.java	12 Feb 2003 15:57:41 -0000	1.5
  +++ ObjectCacheDefaultImpl.java	13 Feb 2003 19:19:21 -0000	1.6
  @@ -58,6 +58,8 @@
   import java.util.Hashtable;
   
   import org.apache.ojb.broker.Identity;
  +import org.apache.ojb.broker.PersistenceBroker;
  +import org.apache.ojb.broker.PersistenceBrokerFactory;
   import org.apache.ojb.broker.metadata.ClassNotPersistenceCapableException;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  @@ -104,12 +106,21 @@
       }
   
       /**
  +     * Get the default Broker
  +     * @return PersistenceBroker
  +     */
  +    private PersistenceBroker getBroker()
  +    {
  +        return PersistenceBrokerFactory.defaultPersistenceBroker();
  +    }
  +    
  +    /**
        * Make object obj persistent to Objectcache.
        * compute objects identity and use it as key for the hashmap
        */
       public void cache(Object obj) throws ClassNotPersistenceCapableException
       {
  -        Identity oid = new Identity(obj);
  +        Identity oid = new Identity(obj, getBroker());
           this.cache(oid, obj);
       }
   
  @@ -187,7 +198,7 @@
               }
               else 
               {
  -                oidString = new Identity(obj).toString();
  +                oidString = new Identity(obj,getBroker()).toString();
               }
               objectTable.remove(oidString);
           }