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 ju...@apache.org on 2001/07/24 11:34:56 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method CopyMethod.java DeleteMethod.java MoveMethod.java
juergen 01/07/24 02:34:56
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java DeleteMethod.java MoveMethod.java
Log:
Generated a 207 only in the case the request URI and the error URI are not identical.
Revision Changes Path
1.17 +4 -4 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CopyMethod.java 2001/07/24 01:18:33 1.16
+++ CopyMethod.java 2001/07/24 09:34:55 1.17
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.16 2001/07/24 01:18:33 remm Exp $
- * $Revision: 1.16 $
- * $Date: 2001/07/24 01:18:33 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v 1.17 2001/07/24 09:34:55 juergen Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/07/24 09:34:55 $
*
* ====================================================================
*
@@ -137,7 +137,7 @@
resp.setStatus(WebdavStatus.SC_CREATED);
}
} catch (CopyMacroException e) {
- if(isCollection) {
+ if(generate207Response(isCollection, e, requestUri)) {
String errorMessage = generateErrorMessage(e);
// Write it on the servlet writer
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
1.11 +4 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DeleteMethod.java 2001/07/24 06:43:46 1.10
+++ DeleteMethod.java 2001/07/24 09:34:55 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v 1.10 2001/07/24 06:43:46 remm Exp $
- * $Revision: 1.10 $
- * $Date: 2001/07/24 06:43:46 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v 1.11 2001/07/24 09:34:55 juergen Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/07/24 09:34:55 $
*
* ====================================================================
*
@@ -143,7 +143,7 @@
// If it's not a collection, we don't want to give a 207,
// because it's silly, and it confuses many clients (such as
// MS Web Folders).
- if (isCollection) {
+ if (generate207Response(isCollection, dme, requestUri)) {
String errorMessage = generateErrorMessage(dme);
// Write it on the servlet writer
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);
1.17 +4 -4 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MoveMethod.java 2001/07/24 01:18:33 1.16
+++ MoveMethod.java 2001/07/24 09:34:55 1.17
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.16 2001/07/24 01:18:33 remm Exp $
- * $Revision: 1.16 $
- * $Date: 2001/07/24 01:18:33 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.17 2001/07/24 09:34:55 juergen Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/07/24 09:34:55 $
*
* ====================================================================
*
@@ -133,7 +133,7 @@
resp.setStatus(WebdavStatus.SC_CREATED);
}
} catch (MacroException e) {
- if(isCollection) {
+ if(generate207Response(isCollection, e, requestUri)) {
String errorMessage = generateErrorMessage(e);
// Write it on the servlet writer
resp.setStatus(WebdavStatus.SC_MULTI_STATUS);