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...@locus.apache.org on 2000/10/03 23:55:35 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/webdav/method LockMethod.java WebdavMethod.java
remm 00/10/03 14:55:34
Modified: src/share/org/apache/slide/webdav/method LockMethod.java
WebdavMethod.java
Log:
- Removes some debug info
- Updated lock method to the new lock algorithm
Revision Changes Path
1.12 +58 -34 jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LockMethod.java 2000/09/26 02:44:32 1.11
+++ LockMethod.java 2000/10/03 21:55:31 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java,v 1.11 2000/09/26 02:44:32 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2000/09/26 02:44:32 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/LockMethod.java,v 1.12 2000/10/03 21:55:31 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2000/10/03 21:55:31 $
*
* ====================================================================
*
@@ -482,41 +482,65 @@
lockDate, inheritance, exclusive);
lock.lock(credToken, lockToken);
- lockToken = new NodeLock
- (lockToken,
- namespaceConfig.getCreateRevisionMetadataAction()
- .getUri());
- lock.lock(credToken, lockToken);
-
- lockToken = new NodeLock
- (lockToken,
- namespaceConfig.getModifyRevisionMetadataAction()
- .getUri());
- lock.lock(credToken, lockToken);
+ try {
+ lockToken = new NodeLock
+ (lockToken,
+ namespaceConfig.getCreateRevisionMetadataAction()
+ .getUri());
+ lock.lock(credToken, lockToken);
+ } catch (ObjectIsAlreadyLockedException e) {
+ // Silent catch
+ }
+
+ try {
+ lockToken = new NodeLock
+ (lockToken,
+ namespaceConfig.getModifyRevisionMetadataAction()
+ .getUri());
+ lock.lock(credToken, lockToken);
+ } catch (ObjectIsAlreadyLockedException e) {
+ // Silent catch
+ }
- lockToken = new NodeLock
- (lockToken,
- namespaceConfig.getRemoveRevisionMetadataAction()
- .getUri());
- lock.lock(credToken, lockToken);
+ try {
+ lockToken = new NodeLock
+ (lockToken,
+ namespaceConfig.getRemoveRevisionMetadataAction()
+ .getUri());
+ lock.lock(credToken, lockToken);
+ } catch (ObjectIsAlreadyLockedException e) {
+ // Silent catch
+ }
- lockToken = new NodeLock
- (lockToken,
- namespaceConfig.getModifyRevisionContentAction()
- .getUri());
- lock.lock(credToken, lockToken);
+ try {
+ lockToken = new NodeLock
+ (lockToken,
+ namespaceConfig.getModifyRevisionContentAction()
+ .getUri());
+ lock.lock(credToken, lockToken);
+ } catch (ObjectIsAlreadyLockedException e) {
+ // Silent catch
+ }
- lockToken = new NodeLock
- (lockToken,
- namespaceConfig.getRemoveRevisionContentAction()
- .getUri());
- lock.lock(credToken, lockToken);
+ try {
+ lockToken = new NodeLock
+ (lockToken,
+ namespaceConfig.getRemoveRevisionContentAction()
+ .getUri());
+ lock.lock(credToken, lockToken);
+ } catch (ObjectIsAlreadyLockedException e) {
+ // Silent catch
+ }
- lockToken =
- new NodeLock(lockToken,
- namespaceConfig.getRemoveObjectAction()
- .getUri());
- lock.lock(credToken, lockToken);
+ try {
+ lockToken =
+ new NodeLock(lockToken,
+ namespaceConfig.getRemoveObjectAction()
+ .getUri());
+ lock.lock(credToken, lockToken);
+ } catch (ObjectIsAlreadyLockedException e) {
+ // Silent catch
+ }
resp.setStatus(WebdavStatus.SC_OK);
1.10 +5 -5 jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java
Index: WebdavMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WebdavMethod.java 2000/09/26 02:44:33 1.9
+++ WebdavMethod.java 2000/10/03 21:55:32 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java,v 1.9 2000/09/26 02:44:33 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2000/09/26 02:44:33 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/webdav/method/WebdavMethod.java,v 1.10 2000/10/03 21:55:32 remm Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/10/03 21:55:32 $
*
* ====================================================================
*
@@ -408,7 +408,7 @@
// Retrieve if header
String ifHeader = req.getHeader("If");
- System.out.println("If header : " + ifHeader);
+ //System.out.println("If header : " + ifHeader);
if (ifHeader == null)
return;
@@ -428,7 +428,7 @@
lockToken = ifHeader.substring(pos + offset, endPos);
}
- System.out.println("Lock Token found :-" + lockToken + "-");
+ //System.out.println("Lock Token found :-" + lockToken + "-");
credToken.addLockToken(lockToken);
pos = ifHeader.indexOf(LOCK_TOKEN, endPos);