juergen 01/09/10 00:16:17
Modified: src/webdav/server/org/apache/slide/webdav/method
UnlockMethod.java MkcolMethod.java LockMethod.java
DeleteMethod.java
Log:
prevent dirty read by setting forcedEnlist.
Revision Changes Path
1.14 +7 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java
Index: UnlockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UnlockMethod.java 2001/08/01 16:30:58 1.13
+++ UnlockMethod.java 2001/09/10 07:16:17 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.13 2001/08/01 16:30:58 cmlenz Exp $
- * $Revision: 1.13 $
- * $Date: 2001/08/01 16:30:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.14 2001/09/10 07:16:17 juergen Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/09/10 07:16:17 $
*
* ====================================================================
*
@@ -151,6 +151,10 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
+
if (lockId != null) {
1.13 +7 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java
Index: MkcolMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MkcolMethod.java 2001/08/01 16:30:58 1.12
+++ MkcolMethod.java 2001/09/10 07:16:17 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.12 2001/08/01 16:30:58 cmlenz Exp $
- * $Revision: 1.12 $
- * $Date: 2001/08/01 16:30:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
1.13 2001/09/10 07:16:17 juergen Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/09/10 07:16:17 $
*
* ====================================================================
*
@@ -136,6 +136,10 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
+
SubjectNode collection = new SubjectNode();
NodeRevisionDescriptor revisionDescriptor =
1.20 +7 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- LockMethod.java 2001/08/01 16:30:58 1.19
+++ LockMethod.java 2001/09/10 07:16:17 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.19 2001/08/01 16:30:58 cmlenz Exp $
- * $Revision: 1.19 $
- * $Date: 2001/08/01 16:30:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.20 2001/09/10 07:16:17 juergen Exp $
+ * $Revision: 1.20 $
+ * $Date: 2001/09/10 07:16:17 $
*
* ====================================================================
*
@@ -407,6 +407,10 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
+
SubjectNode toLockSubject = null;
boolean isCollection = isCollection(lockInfo_lockSubject);
1.13 +7 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java
Index: DeleteMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DeleteMethod.java 2001/08/01 16:30:58 1.12
+++ DeleteMethod.java 2001/09/10 07:16:17 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
1.12 2001/08/01 16:30:58 cmlenz Exp $
- * $Revision: 1.12 $
- * $Date: 2001/08/01 16:30:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
1.13 2001/09/10 07:16:17 juergen Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/09/10 07:16:17 $
*
* ====================================================================
*
@@ -135,6 +135,10 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
+
boolean isCollection = isCollection(toDelete);
try {
macro.delete(slideToken, toDelete);
