You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/06/01 09:23:49 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/lock LockImpl.java
remm 01/06/01 00:23:48
Modified: src/share/org/apache/slide/lock LockImpl.java
Log:
- The current lock token wasn't added to the Slide token before trying
to unlock. This fixes unlocking failures with Office 2000
(and probably other clients too).
Thanks to Michael Smith for the bug report.
Revision Changes Path
1.16 +6 -4 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- LockImpl.java 2001/05/29 02:46:25 1.15
+++ LockImpl.java 2001/06/01 07:23:44 1.16
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v 1.15 2001/05/29 02:46:25 remm Exp $
- * $Revision: 1.15 $
- * $Date: 2001/05/29 02:46:25 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v 1.16 2001/06/01 07:23:44 remm Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/06/01 07:23:44 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Lock helper class.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public final class LockImpl implements Lock {
@@ -215,6 +215,8 @@
while (locksList.hasMoreElements()) {
NodeLock currentLock = (NodeLock) locksList.nextElement();
if (currentLock.getLockId().equals(lockId)) {
+ if (slideToken.isEnforceLockTokens())
+ slideToken.addLockToken(lockId);
unlock(slideToken, currentLock);
}
}