taylor 2003/08/15 11:37:14
Modified: plugin/src/java/org/apache/jetspeed/persistence/impl
OJBODMGPersistencePlugin.java
OJBPBPersistencePlugin.java
Log:
Moved begin transaction up to before getting a broker to properly initiate the ODMG
tx sequence
Revision Changes Path
1.2 +2 -1
jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBODMGPersistencePlugin.java
Index: OJBODMGPersistencePlugin.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBODMGPersistencePlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OJBODMGPersistencePlugin.java 13 Aug 2003 21:21:29 -0000 1.1
+++ OJBODMGPersistencePlugin.java 15 Aug 2003 18:37:14 -0000 1.2
@@ -209,11 +209,12 @@
// 1. Start the transaction
TransactionImpl tx = (TransactionImpl) odmg.newTransaction();
+ tx.begin();
+
// 2. remove object from the OJB cache
PersistenceBroker pb = tx.getBroker();
//pb.removeFromCache(object);
- tx.begin();
tx.markDirty(object);
// 3. retreive a "stale" version of this object from the db
1.2 +2 -1
jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBPBPersistencePlugin.java
Index: OJBPBPersistencePlugin.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/plugin/src/java/org/apache/jetspeed/persistence/impl/OJBPBPersistencePlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OJBPBPersistencePlugin.java 13 Aug 2003 21:21:29 -0000 1.1
+++ OJBPBPersistencePlugin.java 15 Aug 2003 18:37:14 -0000 1.2
@@ -113,7 +113,8 @@
// process update/add operations
while (adds.hasNext())
{
- pb.store(adds.next());
+ Object object = adds.next();
+ pb.store(object);
}
// process delete operations
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
