juergen 2002/07/29 00:59:35
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Fix in checkin(), checkou(), versionControl() and mkworkspace():
If the request is applied to a resource that does support the request, a 403
Forbidden is returned (instead of a Bad Request or Conflict).
(ralf)
Revision Changes Path
1.65 +12 -12
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- VersioningHelper.java 15 Jul 2002 12:25:34 -0000 1.64
+++ VersioningHelper.java 29 Jul 2002 07:59:35 -0000 1.65
@@ -265,8 +265,8 @@
NodeRevisionDescriptor rNrd = content.retrieve( sToken, rNrds );
ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken,
resourcePath, rNrd );
if( !rRk.isSupportedMethod(req.getMethod()) ) {
- resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- throw new WebdavException( WebdavStatus.SC_BAD_REQUEST );
+ resp.setStatus(WebdavStatus.SC_FORBIDDEN);
+ throw new WebdavException( WebdavStatus.SC_FORBIDDEN);
}
NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
@@ -620,7 +620,7 @@
}
if( !rUh.isWorkspaceUri() ) {
throw new PreconditionViolationException(
- new ViolatedPrecondition(C_WORKSPACE_LOCATION_OK,
WebdavStatus.SC_CONFLICT), resourcePath);
+ new ViolatedPrecondition(C_WORKSPACE_LOCATION_OK,
WebdavStatus.SC_FORBIDDEN), resourcePath);
}
if( !rRk.isSupportedMethod(req.getMethod()) ) {
resp.setStatus( WebdavStatus.SC_BAD_REQUEST );
@@ -742,8 +742,8 @@
if( rRk instanceof CheckedOut ) {
throw new PreconditionViolationException(new
ViolatedPrecondition(C_MUST_BE_CHECKED_IN, WebdavStatus.SC_CONFLICT), rNrds.getUri());
}
- resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ resp.setStatus(WebdavStatus.SC_FORBIDDEN);
+ throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
}
if( rRk instanceof CheckedInVersionControlled ) {
@@ -836,8 +836,8 @@
if( rRk instanceof CheckedOut ) {
throw new PreconditionViolationException(new
ViolatedPrecondition(C_MUST_BE_CHECKED_IN, WebdavStatus.SC_CONFLICT), rNrds.getUri());
}
- resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ resp.setStatus(WebdavStatus.SC_FORBIDDEN);
+ throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
}
if( rRk instanceof Version ) {
@@ -1079,8 +1079,8 @@
throw new PreconditionViolationException(
new ViolatedPrecondition(C_MUST_BE_CHECKED_OUT,
WebdavStatus.SC_CONFLICT), rUri);
}
- resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
- throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ resp.setStatus(WebdavStatus.SC_FORBIDDEN);
+ throw new WebdavException(WebdavStatus.SC_FORBIDDEN);
}
if( rRk instanceof CheckedOutVersionControlled || rRk instanceof Working ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
