juergen 2002/07/04 05:19:04
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Fixed bug in method versioinControl():
Check if version control is supported on the given resource BEFORE accessing its
content.
(This caused a NullPointerException when you tried to put a history under version
control.)
(ralf)
Revision Changes Path
1.60 +4 -5
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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- VersioningHelper.java 28 Jun 2002 07:30:54 -0000 1.59
+++ VersioningHelper.java 4 Jul 2002 12:19:04 -0000 1.60
@@ -270,13 +270,12 @@
NodeRevisionDescriptors rNrds = content.retrieve( sToken, resourcePath );
NodeRevisionDescriptor rNrd = content.retrieve( sToken, rNrds );
- NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
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 );
}
+ NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
// Check for rRk = K_VERSION_CONTROLLED*
if( rRk instanceof VersionControlled ) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
