brj 2005/10/08 08:28:28
Modified: src/java/org/apache/ojb/broker/accesslayer Tag:
OJB_1_0_RELEASE RowReaderDefaultImpl.java
src/java/org/apache/ojb/broker/cache Tag: OJB_1_0_RELEASE
ObjectCacheTwoLevelImpl.java
Log:
store inherited values in cache
Revision Changes Path
No revision
No revision
1.30.2.7 +2 -11
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.30.2.6
retrieving revision 1.30.2.7
diff -u -r1.30.2.6 -r1.30.2.7
--- RowReaderDefaultImpl.java 5 Oct 2005 18:01:25 -0000 1.30.2.6
+++ RowReaderDefaultImpl.java 8 Oct 2005 15:28:28 -0000 1.30.2.7
@@ -110,6 +110,7 @@
{
Object result = targetObject;
FieldDescriptor fmd = null;
+ FieldDescriptor[] fields =
targetClassDescriptor.getFieldDescriptor(true);
if(targetObject == null)
{
@@ -118,16 +119,6 @@
}
// 2. fill all scalar attributes of the new object
- FieldDescriptor[] fields;
- if (ojb_clazz)
- {
- fields = targetClassDescriptor.getFieldDescriptor(true);
- }
- else
- {
- fields = targetClassDescriptor.getFieldDescriptor(true);
- }
-
for (int i = 0; i < fields.length; i++)
{
fmd = fields[i];
No revision
No revision
1.1.2.12 +3 -3
db-ojb/src/java/org/apache/ojb/broker/cache/Attic/ObjectCacheTwoLevelImpl.java
Index: ObjectCacheTwoLevelImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/cache/Attic/ObjectCacheTwoLevelImpl.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- ObjectCacheTwoLevelImpl.java 29 Sep 2005 17:26:34 -0000 1.1.2.11
+++ ObjectCacheTwoLevelImpl.java 8 Oct 2005 15:28:28 -0000 1.1.2.12
@@ -620,7 +620,7 @@
ClassDescriptor cld =
broker.getDescriptorRepository().getDescriptorFor(className);
Object target = ClassHelper.buildNewObjectInstance(cld);
// perform main object values
- FieldDescriptor[] flds = cld.getFieldDescriptions();
+ FieldDescriptor[] flds = cld.getFieldDescriptor(true);
FieldDescriptor fld;
for(int i = 0; i < flds.length; i++)
{
@@ -644,7 +644,7 @@
// we store field values by name in a Map
HashMap target = oldObject != null ? (HashMap) oldObject : new
HashMap();
// perform main object values
- FieldDescriptor[] flds = cld.getFieldDescriptions();
+ FieldDescriptor[] flds = cld.getFieldDescriptor(true);
FieldDescriptor fld;
for(int i = 0; i < flds.length; i++)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
