juergen 01/09/01 08:07:06
Modified: src/webdav/server/org/apache/slide/webdav/method
CopyMethod.java
Log:
handle the copy and delete exceptions in the same way, e.g. create a 207 if the
delete of a sub-resource failed caused by a lock.
Revision Changes Path
1.20 +5 -18
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CopyMethod.java 2001/08/31 03:21:45 1.19
+++ CopyMethod.java 2001/09/01 15:07:06 1.20
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CopyMethod.java,v
1.20 2001/09/01 15:07:06 juergen Exp $
+ * $Revision: 1.20 $
+ * $Date: 2001/09/01 15:07:06 $
*
* ====================================================================
*
@@ -139,7 +139,7 @@
} else {
resp.setStatus(WebdavStatus.SC_CREATED);
}
- } catch (CopyMacroException e) {
+ } catch (MacroException e) {
if(generate207Response(isCollection, e, requestUri)) {
String errorMessage = generateErrorMessage(e);
// Write it on the servlet writer
@@ -163,20 +163,6 @@
// throw any WebDAV exception to indicate the transaction wants to be
aborted
//
throw new WebdavException(WebdavStatus.SC_ACCEPTED, false);
- } catch(DeleteMacroException e) {
- Enumeration nestedExceptions = e.enumerateExceptions();
- SlideException sl = (SlideException)nestedExceptions.nextElement();
- if (sl instanceof ObjectLockedException) {
- resp.setStatus(WebdavStatus.SC_LOCKED);
- }
- else {
- resp.setStatus(WebdavStatus.SC_PRECONDITION_FAILED);
- }
- //
- // make sure the transaction is aborted
- // throw any WebDAV exception to indicate the transaction wants to be
aborted
- //
- throw new WebdavException(WebdavStatus.SC_ACCEPTED, false);
}
}
@@ -184,5 +170,6 @@
}
+
