svn commit: r489821 - in /db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core: IdentityFactoryImpl.java MtoNBroker.java

Author: arminw
Date: Fri Dec 22 17:36:33 2006
New Revision: 489821

URL: http://svn.apache.org/viewvc?view=rev&rev=489821
Log:
minor improvement, avoid redundant method calls

Modified:
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/IdentityFactoryImpl.java
    db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/MtoNBroker.java

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/IdentityFactoryImpl.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/IdentityFactoryImpl.java?view=diff&rev=489821&r1=489820&r2=489821
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/IdentityFactoryImpl.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/IdentityFactoryImpl.java Fri Dec 22 17:36:33 2006
@@ -96,11 +96,11 @@
             {
                 // now we are sure that the specified object is not a proxy
                 realClass = objOrProxy.getClass();
-                topLevelClass = broker.getTopLevelClass(realClass);
                 if(cld == null)
                 {
                     cld = broker.getClassDescriptor(realClass);
                 }
+                topLevelClass = cld.getTopLevelClass();
                 BrokerHelper helper = broker.serviceBrokerHelper();
 
                 FieldDescriptor[] fields = cld.getPkFields();

Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/MtoNBroker.java
URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/MtoNBroker.java?view=diff&rev=489821&r1=489820&r2=489821
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/MtoNBroker.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/MtoNBroker.java Fri Dec 22 17:36:33 2006
@@ -139,7 +139,7 @@
 
         String selectStmt = pb.serviceSqlGenerator().getSelectMNStatement(table, fkColumns, pkColumns);
 
-        ClassDescriptor itemCLD = pb.getDescriptorRepository().getDescriptorFor(cod.getItemClass());
+        ClassDescriptor itemCLD = cod.getItemClassDescriptor();
         Collection extents = pb.getDescriptorRepository().getAllConcreteSubclassDescriptors(itemCLD);
         if(extents.size() > 0)
         {
@@ -214,7 +214,7 @@
         }
         List workList = new ArrayList(mnKeys);
         MtoNBroker.Key relatedObjKeys;
-        ClassDescriptor relatedCld = pb.getClassDescriptor(cod.getItemClass());
+        ClassDescriptor relatedCld = cod.getItemClassDescriptor();
 
         BrokerHelper helper = pb.serviceBrokerHelper();
         Object relatedObj;