ozeigermann 2004/01/29 02:16:38
Modified: src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_2_0_RELEASE_BRANCH PropFindMethod.java
Log:
Applied a patch submitted by Daniel Florey to avoid a NPE in case an exception
occured in
content.retrieve(). The exception is now handled in the same way as usual (throwing
a
webdav-exception and sending the errorcode).
Revision Changes Path
No revision
No revision
1.94.2.1 +6 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.94
retrieving revision 1.94.2.1
diff -u -r1.94 -r1.94.2.1
--- PropFindMethod.java 1 Dec 2003 12:10:50 -0000 1.94
+++ PropFindMethod.java 29 Jan 2004 10:16:38 -0000 1.94.2.1
@@ -522,8 +522,9 @@
revisionDescriptor = new NodeRevisionDescriptor(0);
}
} catch (Exception e) {
- e.printStackTrace();
- responseElement = getErrorResponse(object.getUri(), getErrorCode(e),
null);
+ int statusCode = getErrorCode( e );
+ sendError( statusCode, e );
+ throw new WebdavException( statusCode );
}
Vector propertiesParser = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]