cvs commit: db-ojb/src/java/org/apache/ojb/odmg/locking LockManagerOdmgImpl.java

[arminw]

arminw      2005/12/31 10:43:30

  Modified:    src/java/org/apache/ojb/odmg/locking Tag: OJB_1_0_RELEASE
                        LockManagerOdmgImpl.java
  Log:
  simplify checks
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.5   +4 -4      
db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerOdmgImpl.java
  
  Index: LockManagerOdmgImpl.java
  ===================================================================
  RCS file: 
/home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockManagerOdmgImpl.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- LockManagerOdmgImpl.java  21 Dec 2005 22:29:51 -0000      1.1.2.4
  +++ LockManagerOdmgImpl.java  31 Dec 2005 18:43:30 -0000      1.1.2.5
  @@ -53,7 +53,7 @@
       {
           ClassDescriptor cld = 
tx.getBroker().getClassDescriptor(ProxyHelper.getRealClass(obj));
           int isolationLevel = cld.getIsolationLevel();
  -        return ignore(isolationLevel) ? true : lm.readLock(tx.getGUID(), 
oid, isolationLevel);
  +        return ignore(isolationLevel) || lm.readLock(tx.getGUID(), oid, 
isolationLevel);
       }
   
       public boolean writeLock(TransactionImpl tx, Object obj)
  @@ -66,7 +66,7 @@
       {
           ClassDescriptor cld = 
tx.getBroker().getClassDescriptor(ProxyHelper.getRealClass(obj));
           int isolationLevel = cld.getIsolationLevel();
  -        return ignore(isolationLevel) ? true : lm.writeLock(tx.getGUID(), 
oid, isolationLevel);
  +        return ignore(isolationLevel) || lm.writeLock(tx.getGUID(), oid, 
isolationLevel);
       }
   
       public boolean upgradeLock(TransactionImpl tx, Object obj)
  @@ -79,7 +79,7 @@
       {
           ClassDescriptor cld = 
tx.getBroker().getClassDescriptor(ProxyHelper.getRealClass(obj));
           int isolationLevel = cld.getIsolationLevel();
  -        return ignore(isolationLevel) ? true : lm.upgradeLock(tx.getGUID(), 
oid, isolationLevel);
  +        return ignore(isolationLevel) || lm.upgradeLock(tx.getGUID(), oid, 
isolationLevel);
       }
   
       public boolean releaseLock(TransactionImpl tx, Object obj)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]