You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2003/12/11 01:36:42 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer RowReaderDefaultImpl.java

arminw      2003/12/10 16:36:42

  Modified:    src/java/org/apache/ojb/broker/metadata ClassDescriptor.java
               src/java/org/apache/ojb/broker/accesslayer
                        RowReaderDefaultImpl.java
  Log:
  cache ojbConcreteClass field-descriptor in class-descriptor
  if exit
  
  Revision  Changes    Path
  1.75      +4 -5      db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
  
  Index: ClassDescriptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- ClassDescriptor.java	9 Dec 2003 17:19:58 -0000	1.74
  +++ ClassDescriptor.java	11 Dec 2003 00:36:41 -0000	1.75
  @@ -155,7 +155,7 @@
       /**
        * used to signal use of ojbConcreteClass field
        */
  -    private transient boolean ojbConcreteFieldCheckDone;
  +    private transient boolean ojbConcreteFieldCheckDone = false;
       private transient FieldDescriptor ojbConcreteClassField;
       //---------------------------------------------------------------
       // end transient fields
  @@ -2005,13 +2005,12 @@
        */
       public FieldDescriptor getOjbConcreteClassField()
       {
  -        FieldDescriptor result = null;
           // if not checked before
           if(!ojbConcreteFieldCheckDone)
           {
  -            ojbConcreteClassField = getFieldDescriptorByName(ClassDescriptor.OJB_CONCRETE_CLASS);
  +            ojbConcreteClassField = getFieldDescriptorByName(OJB_CONCRETE_CLASS);
               ojbConcreteFieldCheckDone = true;
           }
  -        return result;
  +        return ojbConcreteClassField;
       }
   }
  
  
  
  1.26      +2 -2      db-ojb/src/java/org/apache/ojb/broker/accesslayer/RowReaderDefaultImpl.java
  
  Index: RowReaderDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RowReaderDefaultImpl.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- RowReaderDefaultImpl.java	9 Dec 2003 17:19:59 -0000	1.25
  +++ RowReaderDefaultImpl.java	11 Dec 2003 00:36:41 -0000	1.26
  @@ -174,7 +174,7 @@
       protected ClassDescriptor selectClassDescriptor(Map row) throws PersistenceBrokerException
       {
           // check if there is an attribute which tells us which concrete class is to be instantiated
  -        FieldDescriptor concreteClassFD = m_cld.getFieldDescriptorByName(ClassDescriptor.OJB_CONCRETE_CLASS);
  +        FieldDescriptor concreteClassFD = m_cld.getOjbConcreteClassField();
   
           if (concreteClassFD == null)
               return m_cld;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org