pnever 2003/09/08 08:46:40
Modified: src/share/org/apache/slide/lock LockImpl.java
Log:
Fixed bug in isCompatible
Revision Changes Path
1.33 +33 -34 jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java
Index: LockImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- LockImpl.java 8 Sep 2003 13:42:53 -0000 1.32
+++ LockImpl.java 8 Sep 2003 15:46:40 -0000 1.33
@@ -717,8 +717,8 @@
boolean condition5 = checkLockToken(slideToken, token2);
// enforced-locktokens
boolean condition6 = slideToken.isEnforceLockTokens();
- // token2-is-inheritable
- boolean condition7 = token2.isInheritable();
+ // same-object-uri-OR-token2-is-inheritable
+ boolean condition7 =
token2.getObjectUri().equals(token1.getObjectUri()) || token2.isInheritable();
if ((tryToLock && condition1 && condition4 && condition7)
|| (condition3 && !condition2 && !condition6 && condition7)
@@ -732,40 +732,39 @@
compatible = true;
}
- // System.out.println();
- // System.out.println("SlideToken:");
- // System.out.println(" .showLockTokens = " +
((SlideTokenImpl)slideToken).showLockTokens());
- // System.out.println(" .isEnforceLockTokens = " +
slideToken.isEnforceLockTokens());
- // System.out.println("Token1 = " + token1);
- // System.out.println(" .getLockId = " +
token1.getLockId());
- // System.out.println(" .getTypeUri = " +
token1.getTypeUri());
- // System.out.println(" .getSubjectUri = " +
token1.getSubjectUri());
- // System.out.println(" .getObjectUri = " +
token1.getObjectUri());
- // System.out.println(" .isExclusive = " +
token1.isExclusive());
- // System.out.println(" .isInheritable() = " +
token1.isInheritable());
- // System.out.println("Token2 = " + token2);
- // System.out.println(" .getLockId = " +
token2.getLockId());
- // System.out.println(" .getTypeUri = " +
token2.getTypeUri());
- // System.out.println(" .getSubjectUri = " +
token2.getSubjectUri());
- // System.out.println(" .getObjectUri = " +
token2.getObjectUri());
- // System.out.println(" .isExclusive = " +
token2.isExclusive());
- // System.out.println(" .isInheritable() = " +
token2.isInheritable());
- // System.out.println("Parameter tryToLock: "+tryToLock);
- // System.out.println("C1
(lock-types-are-equal).................................: " + condition1);
- // System.out.println("C2 (user-of-tokens-are-equal OR
user-of-token2-is-parent).: " + condition2);
- // System.out.println("C3 (lock-types-are-equal OR
lock-type-of-token1-is-parent): " + condition3);
- // System.out.println("C4
(token1-is-exclusive)..................................: " + condition4);
- // System.out.println("C5
(check-token2-against-slidetoken)......................: " + condition5);
- // System.out.println("C6
(enforced-locktokens)..................................: " + condition6);
- // System.out.println("C7
(token2-is-inheritable)................................: " + condition7);
- // System.out.println("Compatible (tryToLock && C1 && C4 &&
C7 || C3 && !C2 && !C6 && C7 || C3 && !C5 && C6 && C7): " + compatible);
+// System.out.println();
+// System.out.println("SlideToken:");
+// System.out.println(" .showLockTokens = " +
slideToken.showLockTokens());
+// System.out.println(" .isEnforceLockTokens = " +
slideToken.isEnforceLockTokens());
+// System.out.println("Token1 = " + token1);
+// System.out.println(" .getLockId = " + token1.getLockId());
+// System.out.println(" .getTypeUri = " + token1.getTypeUri());
+// System.out.println(" .getSubjectUri = " + token1.getSubjectUri());
+// System.out.println(" .getObjectUri = " + token1.getObjectUri());
+// System.out.println(" .isExclusive = " + token1.isExclusive());
+// System.out.println(" .isInheritable() = " + token1.isInheritable());
+// System.out.println("Token2 = " + token2);
+// System.out.println(" .getLockId = " + token2.getLockId());
+// System.out.println(" .getTypeUri = " + token2.getTypeUri());
+// System.out.println(" .getSubjectUri = " + token2.getSubjectUri());
+// System.out.println(" .getObjectUri = " + token2.getObjectUri());
+// System.out.println(" .isExclusive = " + token2.isExclusive());
+// System.out.println(" .isInheritable() = " + token2.isInheritable());
+// System.out.println("Parameter tryToLock: "+tryToLock);
+// System.out.println("C1
(lock-types-are-equal).................................: " + condition1);
+// System.out.println("C2 (user-of-tokens-are-equal OR
user-of-token2-is-parent).: " + condition2);
+// System.out.println("C3 (lock-types-are-equal OR
lock-type-of-token1-is-parent): " + condition3);
+// System.out.println("C4
(token1-is-exclusive)..................................: " + condition4);
+// System.out.println("C5
(check-token2-against-slidetoken)......................: " + condition5);
+// System.out.println("C6
(enforced-locktokens)..................................: " + condition6);
+// System.out.println("C7
(same-object-uri-OR-token2-is-inheritable).............: " + condition7);
+// System.out.println("Compatible (tryToLock && C1 && C4 && C7 || C3 &&
!C2 && !C6 && C7 || C3 && !C5 && C6 && C7): " + compatible);
}
return compatible;
}
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
