You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2003/02/06 22:14:13 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/odmg/locking PersistentLockMapImpl.java InMemoryLockMapImpl.java
brj 2003/02/06 13:14:13
Modified: src/java/org/apache/ojb/odmg/locking
PersistentLockMapImpl.java InMemoryLockMapImpl.java
Log:
avoid deprecated Identity constructor
Revision Changes Path
1.8 +5 -5 db-ojb/src/java/org/apache/ojb/odmg/locking/PersistentLockMapImpl.java
Index: PersistentLockMapImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/PersistentLockMapImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PersistentLockMapImpl.java 24 Nov 2002 15:51:27 -0000 1.7
+++ PersistentLockMapImpl.java 6 Feb 2003 21:14:13 -0000 1.8
@@ -193,7 +193,7 @@
removeTimedOutLocks(AbstractLockStrategy.DEFAULT_LOCK_TIMEOUT);
try
{
- LockEntry lock = new LockEntry(new Identity(obj).toString(),
+ LockEntry lock = new LockEntry(new Identity(obj,getBroker()).toString(),
tx.getGUID(),
System.currentTimeMillis(),
LockStrategyFactory.getIsolationLevel(obj),
@@ -219,7 +219,7 @@
{
try
{
- LockEntry lock = new LockEntry(new Identity(obj).toString(), tx.getGUID());
+ LockEntry lock = new LockEntry(new Identity(obj,getBroker()).toString(), tx.getGUID());
getBroker().delete(lock);
unCache(lock);
}
@@ -276,7 +276,7 @@
removeTimedOutLocks(AbstractLockStrategy.DEFAULT_LOCK_TIMEOUT);
try
{
- LockEntry lock = new LockEntry(new Identity(obj).toString(),
+ LockEntry lock = new LockEntry(new Identity(obj,getBroker()).toString(),
tx.getGUID(),
System.currentTimeMillis(),
LockStrategyFactory.getIsolationLevel(obj),
@@ -302,8 +302,8 @@
removeTimedOutLocks(AbstractLockStrategy.DEFAULT_LOCK_TIMEOUT);
try
{
- LockEntry lock = new LockEntry(new Identity(obj).toString(), tx.getGUID());
- Identity oid = new Identity(lock);
+ LockEntry lock = new LockEntry(new Identity(obj,getBroker()).toString(), tx.getGUID());
+ Identity oid = new Identity(lock,getBroker());
LockEntry result = (LockEntry) getBroker().getObjectByIdentity(oid);
unCache(result);
1.10 +5 -5 db-ojb/src/java/org/apache/ojb/odmg/locking/InMemoryLockMapImpl.java
Index: InMemoryLockMapImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/InMemoryLockMapImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- InMemoryLockMapImpl.java 24 Nov 2002 16:08:53 -0000 1.9
+++ InMemoryLockMapImpl.java 6 Feb 2003 21:14:13 -0000 1.10
@@ -142,7 +142,7 @@
{
removeTimedOutLocks(AbstractLockStrategy.DEFAULT_LOCK_TIMEOUT);
}
- Identity oid = new Identity(obj);
+ Identity oid = new Identity(obj,getBroker());
ObjectLocks objectLocks = null;
synchronized (locktable)
@@ -169,7 +169,7 @@
{
removeTimedOutLocks(AbstractLockStrategy.DEFAULT_LOCK_TIMEOUT);
}
- Identity oid = new Identity(obj);
+ Identity oid = new Identity(obj,getBroker());
LockEntry reader = new LockEntry(oid.toString(),
tx.getGUID(),
System.currentTimeMillis(),
@@ -204,7 +204,7 @@
{
removeTimedOutLocks(AbstractLockStrategy.DEFAULT_LOCK_TIMEOUT);
}
- Identity oid = new Identity(obj);
+ Identity oid = new Identity(obj, getBroker());
String oidString = oid.toString();
ObjectLocks objectLocks = null;
synchronized (locktable)
@@ -355,7 +355,7 @@
{
removeTimedOutLocks(AbstractLockStrategy.DEFAULT_LOCK_TIMEOUT);
}
- Identity oid = new Identity(obj);
+ Identity oid = new Identity(obj,getBroker());
ObjectLocks objectLocks = null;
synchronized (locktable)
{