svn commit: r429272 - /jakarta/slide/trunk/src/share/org/apache/slide/lock/LockImpl.java

Author: luetzkendorf
Date: Mon Aug  7 01:28:04 2006
New Revision: 429272

URL: http://svn.apache.org/viewvc?rev=429272&view=rev
Log:
Fix: User that is not Lock-Owner but has the DAV:unlock privilege could not remove a lock
(testcase functional\lock\mix\killLock.xml)

Modified:
    jakarta/slide/trunk/src/share/org/apache/slide/lock/LockImpl.java

Modified: jakarta/slide/trunk/src/share/org/apache/slide/lock/LockImpl.java
URL: http://svn.apache.org/viewvc/jakarta/slide/trunk/src/share/org/apache/slide/lock/LockImpl.java?rev=429272&r1=429271&r2=429272&view=diff
==============================================================================
--- jakarta/slide/trunk/src/share/org/apache/slide/lock/LockImpl.java (original)
+++ jakarta/slide/trunk/src/share/org/apache/slide/lock/LockImpl.java Mon Aug  7 01:28:04 2006
@@ -754,7 +754,7 @@
         if ((tryToLock && condition1 && condition4)
             || (condition3 && !condition2 && !condition6)
             || (condition3 && !condition5 && condition6)
-            || (condition5 && !condition2)  // FIXES 30982
+            || (condition5 && !condition2 && condition3)  // FIXES 30982
            ){
             compatible = false;
         }