juergen 01/02/15 04:49:29
Modified: src/webdav/server/org/apache/slide/webdav/method
DeleteMethod.java
Log:
if the delete method was executed onto an object, which did not exist an internal
server error was reported. Now 404 is reported.
Revision Changes Path
1.5 +12 -12
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteMethod.java 2001/02/11 20:39:24 1.4
+++ DeleteMethod.java 2001/02/15 12:49:27 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
1.4 2001/02/11 20:39:24 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/11 20:39:24 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/DeleteMethod.java,v
1.5 2001/02/15 12:49:27 juergen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/02/15 12:49:27 $
*
* ====================================================================
*
@@ -133,10 +133,10 @@
* @exception WebdavException Unrecoverable error while deleting
*/
protected void executeRequest()
- throws WebdavException {
-
- try {
- macro.delete(slideToken, toDelete);
+ throws WebdavException {
+
+ try {
+ macro.delete(slideToken, toDelete);
resp.setStatus(WebdavStatus.SC_NO_CONTENT);
} catch (DeleteMacroException e) {
String errorMessage = generateErrorMessage(e);
@@ -186,7 +186,7 @@
throw ex;
} catch(ObjectNotFoundException e) {
generateStatusText(errorMessage, e.getObjectUri(),
- WebdavStatus.SC_INTERNAL_SERVER_ERROR);
+ WebdavStatus.SC_NOT_FOUND);
} catch(AccessDeniedException e) {
generateStatusText(errorMessage, e.getObjectUri(),
WebdavStatus.SC_FORBIDDEN);
@@ -241,13 +241,13 @@
printer.writeElement("d", "status", WebdavXMLPrinter.CLOSING);
}
-
-
+
+
/**
* Returns true
*/
- protected boolean methodNeedsTransactionSupport() {
- return true;
+ protected boolean methodNeedsTransactionSupport() {
+ return true;
}
