arminw 2005/12/14 18:15:17
Modified: src/java/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
TransactionImpl.java
Log:
fix proxy object issue
Revision Changes Path
No revision
No revision
1.59.2.24 +8 -3 db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java
Index: TransactionImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java,v
retrieving revision 1.59.2.23
retrieving revision 1.59.2.24
diff -u -r1.59.2.23 -r1.59.2.24
--- TransactionImpl.java 13 Dec 2005 18:21:24 -0000 1.59.2.23
+++ TransactionImpl.java 15 Dec 2005 02:15:17 -0000 1.59.2.24
@@ -273,7 +273,10 @@
// list of registered objects to avoid endless loops on
circular objects
registeredObjects.add(rtObject.getIdentity());
// lock and register 1:1 references first
- lockAndRegisterReferences(rtObject.getCld(),
rtObject.getObj(), lockMode, registeredObjects);
+ //
+ // If implicit locking is used, we have materialize the main
object
+ // to lock the referenced objects too
+ lockAndRegisterReferences(rtObject.getCld(),
rtObject.getObjMaterialized(), lockMode, registeredObjects);
}
try
{
@@ -307,7 +310,9 @@
if(cascade)
{
// perform locks and register 1:n and m:n references
- lockAndRegisterCollections(rtObject.getCld(),
rtObject.getObj(), lockMode, registeredObjects);
+ // If implicit locking is used, we have materialize the main
object
+ // to lock the referenced objects too
+ lockAndRegisterCollections(rtObject.getCld(),
rtObject.getObjMaterialized(), lockMode, registeredObjects);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
