You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2003/02/14 15:27:55 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method PutMethod.java
pnever 2003/02/14 06:27:55
Modified: src/webdav/server/org/apache/slide/webdav/method
PutMethod.java
Log:
Minor bug: did not set DAV:owner property when *updating* a lock-null resource
Revision Changes Path
1.62 +15 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- PutMethod.java 31 Oct 2002 14:50:20 -0000 1.61
+++ PutMethod.java 14 Feb 2003 14:27:54 -0000 1.62
@@ -294,13 +294,22 @@
// Resource type
revisionDescriptor.setResourceType("");
+ // Owner
+ if ( isLockedNullResource )
+ // set the owner when updating a lock-null resource
+ revisionDescriptor.setOwner(
+ slideToken.getCredentialsToken().
+ getPublicCredentials());
+
content.store(slideToken, resourcePath, revisionDescriptor,
revisionContent);
// Changed for DeltaV --start--
// check if the resource should be put under version-control
- if ( isLockedNullResource && Configuration.useVersionControl() && AUTO_VERSION_CONTROL && !isInVersioncontrolExcludePath ) {
- versioningHelper.versionControl(resourcePath);
+ if ( isLockedNullResource ) {
+ if ( Configuration.useVersionControl() && AUTO_VERSION_CONTROL && !isInVersioncontrolExcludePath ) {
+ versioningHelper.versionControl(resourcePath);
+ }
}
if( Configuration.useVersionControl() && mustCheckIn) {
versioningHelper.checkin(revisionDescriptors, revisionDescriptor, false, false, true ); //forkOk=false, keepCheckedOut=false
@@ -510,5 +519,6 @@
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org