remm 01/08/30 20:21:45
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java MoveMethod.java
PropPatchMethod.java PutMethod.java
Log:
- Use the new ForceStoreEnlistment flag in COPY, MOVE, PROPPATCH
and PUT, to prevent dirty reads (Juergen, is it doing what it is supposed to be
doing ?).
Revision Changes Path
1.19 +6 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CopyMethod.java 2001/08/01 16:30:58 1.18
+++ CopyMethod.java 2001/08/31 03:21:45 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.18 2001/08/01 16:30:58 cmlenz Exp $
- * $Revision: 1.18 $
- * $Date: 2001/08/01 16:30:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.19 2001/08/31 03:21:45 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/08/31 03:21:45 $
*
* ====================================================================
*
@@ -118,6 +118,9 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
MacroParameters macroParameters = null;
String status = null;
1.19 +6 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MoveMethod.java 2001/08/01 16:30:58 1.18
+++ MoveMethod.java 2001/08/31 03:21:45 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.18 2001/08/01 16:30:58 cmlenz Exp $
- * $Revision: 1.18 $
- * $Date: 2001/08/01 16:30:58 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.19 2001/08/31 03:21:45 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/08/31 03:21:45 $
*
* ====================================================================
*
@@ -115,6 +115,9 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
MacroParameters macroParameters = null;
boolean isCollection = isCollection(sourceUri);
1.20 +6 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PropPatchMethod.java 2001/08/17 14:39:12 1.19
+++ PropPatchMethod.java 2001/08/31 03:21:45 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.19 2001/08/17 14:39:12 cmlenz Exp $
- * $Revision: 1.19 $
- * $Date: 2001/08/17 14:39:12 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropPatchMethod.java,v
1.20 2001/08/31 03:21:45 remm Exp $
+ * $Revision: 1.20 $
+ * $Date: 2001/08/31 03:21:45 $
*
* ====================================================================
*
@@ -250,6 +250,9 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
try {
1.17 +6 -3
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PutMethod.java 2001/08/17 14:39:12 1.16
+++ PutMethod.java 2001/08/31 03:21:45 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.16 2001/08/17 14:39:12 cmlenz Exp $
- * $Revision: 1.16 $
- * $Date: 2001/08/17 14:39:12 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
1.17 2001/08/31 03:21:45 remm Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/08/31 03:21:45 $
*
* ====================================================================
*
@@ -137,6 +137,9 @@
*/
protected void executeRequest()
throws WebdavException {
+
+ // Prevent dirty reads
+ slideToken.setForceStoreEnlistment(true);
try {