pnever 2002/07/31 09:07:54
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Postponed retrieval of NRC after resource-type-check to avoid exceptions in the
store.
Revision Changes Path
1.69 +6 -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.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- VersioningHelper.java 31 Jul 2002 12:24:01 -0000 1.68
+++ VersioningHelper.java 31 Jul 2002 16:07:54 -0000 1.69
@@ -268,7 +268,6 @@
resp.setStatus(WebdavStatus.SC_FORBIDDEN);
throw new WebdavException( WebdavStatus.SC_FORBIDDEN);
}
- NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
// Check for rRk = K_VERSION_CONTROLLED*
if( rRk instanceof VersionControlled ) {
@@ -292,7 +291,9 @@
if( !vrNrd.exists(p.getName()) )
vrNrd.setProperty( p );
}
+
// Copy content-type VCR->VR
+ NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
vrNrd.setContentType(rNrd.getContentType()); // P_GETCONTENTTYPE
vrNrd.setContentLength(rNrd.getContentLength()); // P_GETCONTENTLENGTH
@@ -1069,7 +1070,6 @@
Iterator i;
Enumeration j;
- NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
String rUri = getUri( rNrds, rNrd );
ResourceKind rRk = AbstractResourceKind.determineResourceKind( nsaToken,
rNrds, rNrd );
@@ -1140,6 +1140,7 @@
vrNrdNew.setContentType(rNrd.getContentType()); // P_GETCONTENTTYPE
vrNrdNew.setContentLength(rNrd.getContentLength()); //
P_GETCONTENTLENGTH
+ NodeRevisionContent rNrc = content.retrieve( sToken, rNrds, rNrd );
content.create( sToken, vhrUri, vrNrdNew, rNrc );
String vrUriNew = vhrUri+"/"+vrNrdNew.getRevisionNumber().toString();
UriHandler vrUhNew = UriHandler.getUriHandler( vrUriNew );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
