ozeigermann 2004/05/28 04:49:56
Modified: src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_2_0_RELEASE_BRANCH AbstractWebdavMethod.java
Log:
Do not report object not found
Revision Changes Path
No revision
No revision
1.20.2.6 +15 -11
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java
Index: AbstractWebdavMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- AbstractWebdavMethod.java 28 May 2004 11:34:19 -0000 1.20.2.5
+++ AbstractWebdavMethod.java 28 May 2004 11:49:56 -0000 1.20.2.6
@@ -327,14 +327,18 @@
Enumeration locks = lock.enumerateLocks(slideToken, requestUri);
if (!locks.hasMoreElements()) {
-
- NodeRevisionDescriptors revisionDescriptors =
content.retrieve(slideToken, requestUri);
- NodeRevisionDescriptor revisionDescriptor =
content.retrieve(slideToken, revisionDescriptors);
- if (isLockNull(revisionDescriptor)) {
- content.remove(slideToken, requestUri,
revisionDescriptor);
- content.remove(slideToken, revisionDescriptors);
- ObjectNode node = structure.retrieve(slideToken,
requestUri);
- structure.remove(slideToken, node);
+ try {
+ NodeRevisionDescriptors revisionDescriptors =
content.retrieve(slideToken, requestUri);
+ NodeRevisionDescriptor revisionDescriptor =
+ content.retrieve(slideToken, revisionDescriptors);
+ if (isLockNull(revisionDescriptor)) {
+ content.remove(slideToken, requestUri,
revisionDescriptor);
+ content.remove(slideToken, revisionDescriptors);
+ ObjectNode node = structure.retrieve(slideToken,
requestUri);
+ structure.remove(slideToken, node);
+ }
+ } catch (ObjectNotFoundException onfe) {
+ // XXX do not report as there might simply be no
resource here
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
