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:34:10 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/odmg/locking LockManagerDefaultImpl.java
brj 2003/02/06 13:34:10
Modified: src/java/org/apache/ojb/odmg/locking
LockManagerDefaultImpl.java
Log:
avoid deprecated Identity constructor
Revision Changes Path
1.4 +6 -6 db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerDefaultImpl.java
Index: LockManagerDefaultImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerDefaultImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LockManagerDefaultImpl.java 7 Sep 2002 19:57:14 -0000 1.3
+++ LockManagerDefaultImpl.java 6 Feb 2003 21:34:10 -0000 1.4
@@ -105,7 +105,7 @@
*/
public boolean readLock(TransactionImpl tx, Object obj)
{
- if (log.isDebugEnabled()) log.debug("LM.readLock(tx-" + tx.getGUID() + ", " + new Identity(obj).toString() + ")");
+ if (log.isDebugEnabled()) log.debug("LM.readLock(tx-" + tx.getGUID() + ", " + new Identity(obj, tx.getBroker()).toString() + ")");
LockStrategy lockStrategy = LockStrategyFactory.getStrategyFor(obj);
return lockStrategy.readLock(tx, obj);
}
@@ -116,7 +116,7 @@
*/
public boolean writeLock(TransactionImpl tx, Object obj)
{
- if (log.isDebugEnabled()) log.debug("LM.writeLock(tx-" + tx.getGUID() + ", " + new Identity(obj).toString() + ")");
+ if (log.isDebugEnabled()) log.debug("LM.writeLock(tx-" + tx.getGUID() + ", " + new Identity(obj, tx.getBroker()).toString() + ")");
LockStrategy lockStrategy = LockStrategyFactory.getStrategyFor(obj);
return lockStrategy.writeLock(tx, obj);
}
@@ -128,7 +128,7 @@
*/
public boolean upgradeLock(TransactionImpl tx, Object obj)
{
- if (log.isDebugEnabled()) log.debug("LM.upgradeLock(tx-" + tx.getGUID() + ", " + new Identity(obj).toString() + ")");
+ if (log.isDebugEnabled()) log.debug("LM.upgradeLock(tx-" + tx.getGUID() + ", " + new Identity(obj, tx.getBroker()).toString() + ")");
LockStrategy lockStrategy = LockStrategyFactory.getStrategyFor(obj);
return lockStrategy.upgradeLock(tx, obj);
}
@@ -139,7 +139,7 @@
*/
public boolean releaseLock(TransactionImpl tx, Object obj)
{
- if (log.isDebugEnabled()) log.debug("LM.releaseLock(tx-" + tx.getGUID() + ", " + new Identity(obj).toString() + ")");
+ if (log.isDebugEnabled()) log.debug("LM.releaseLock(tx-" + tx.getGUID() + ", " + new Identity(obj, tx.getBroker()).toString() + ")");
LockStrategy lockStrategy = LockStrategyFactory.getStrategyFor(obj);
return lockStrategy.releaseLock(tx, obj);
}
@@ -150,7 +150,7 @@
*/
public boolean checkRead(TransactionImpl tx, Object obj)
{
- if (log.isDebugEnabled()) log.debug("LM.checkRead(tx-" + tx.getGUID() + ", " + new Identity(obj).toString() + ")");
+ if (log.isDebugEnabled()) log.debug("LM.checkRead(tx-" + tx.getGUID() + ", " + new Identity(obj, tx.getBroker()).toString() + ")");
LockStrategy lockStrategy = LockStrategyFactory.getStrategyFor(obj);
return lockStrategy.checkRead(tx, obj);
}
@@ -161,7 +161,7 @@
*/
public boolean checkWrite(TransactionImpl tx, Object obj)
{
- if (log.isDebugEnabled()) log.debug("LM.checkWrite(tx-" + tx.getGUID() + ", " + new Identity(obj).toString() + ")");
+ if (log.isDebugEnabled()) log.debug("LM.checkWrite(tx-" + tx.getGUID() + ", " + new Identity(obj, tx.getBroker()).toString() + ")");
LockStrategy lockStrategy = LockStrategyFactory.getStrategyFor(obj);
return lockStrategy.checkWrite(tx, obj);
}