db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/singlevm PersistenceBrokerImpl.java
Date Fri, 07 Mar 2003 17:45:01 GMT
brj         2003/03/07 09:45:00

  Modified:    src/java/org/apache/ojb/broker/singlevm
                        PersistenceBrokerImpl.java
  Log:
  do not call getTopLevelClass if keys are null
  
  Revision  Changes    Path
  1.139     +6 -5      db-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java
  
  Index: PersistenceBrokerImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- PersistenceBrokerImpl.java	2 Mar 2003 22:38:28 -0000	1.138
  +++ PersistenceBrokerImpl.java	7 Mar 2003 17:45:00 -0000	1.139
  @@ -1182,11 +1182,8 @@
        */
       private Object getReferencedObject(Object obj, ObjectReferenceDescriptor rds, ClassDescriptor
cld)
       {
  -        Class referencedClass = rds.getItemClass();
  -        // ensure that top-level extents are used for Identities
  -        referencedClass = descriptorRepository.getTopLevelClass(referencedClass);
  +        Class referencedClass, referencedProxy;
           Object[] pkVals = rds.getForeignKeyValues(obj, cld);
  -        Class referencedProxy;
           boolean allPkNull = true;
   
           //
  @@ -1207,6 +1204,10 @@
           {
               return null;
           }
  +
  +        // ensure that top-level extents are used for Identities
  +        referencedClass = descriptorRepository.getTopLevelClass(rds.getItemClass());  
  
  +        
           if (rds.isLazy())
           {
               referencedProxy = getClassDescriptor(referencedClass).getDynamicProxyClass();
  
  
  

Mime
View raw message