Author: arminw
Date: Sat Jan 28 03:01:32 2006
New Revision: 373134
URL: http://svn.apache.org/viewcvs?rev=373134&view=rev
Log:
adopt refactored locking
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
URL:
http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java?rev=373134&r1=373133&r2=373134&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
Sat Jan 28 03:01:32 2006
@@ -58,7 +58,7 @@
* MBAIRD: added explicit closing and de-referencing to prevent any
* GC issues.
*/
-class ObjectEnvelopeTable
+public class ObjectEnvelopeTable
{
private Logger log = LoggerFactory.getLogger(ObjectEnvelopeTable.class);
private final TransactionImpl transaction;
@@ -102,6 +102,14 @@
return transaction;
}
+ /**
+ * Returns the number of registered objects.
+ */
+ public int registeredObjectCount()
+ {
+ return objectEnvelopesMap.size();
+ }
+
/** prepare this instance for re-/use */
void prepareForUse()
{
@@ -265,7 +273,7 @@
mod.getModificationState().commit(mod);
if(reuse && insert)
{
-
getTransaction().internalSingleLock(mod.getClassDescriptor(), mod.getObject(),
mod.getIdentity(), Transaction.WRITE);
+
getTransaction().internalSingleLock(mod.getClassDescriptor(),
mod.getIdentity(), Transaction.WRITE);
}
}
/*
@@ -331,7 +339,7 @@
// if the object isn't already locked, we will do it
now
if(!mod.isWriteLocked())
{
- tx.internalSingleLock(cld, mod.getObject(),
mod.getIdentity(), Transaction.WRITE);
+ tx.internalSingleLock(cld, mod.getIdentity(),
Transaction.WRITE);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
