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/05/17 18:14:01 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util VersioningHelper.java
pnever 2003/05/17 09:14:01
Modified: src/webdav/server/org/apache/slide/webdav/util
VersioningHelper.java
Log:
Fixed bug in precondition "one-version-controlled-resource-per-history-per-workspace"
check:
if the req-URI is not in the scope of a workspace, take the main scope instead and
avoid internal server error
Revision Changes Path
1.87 +5 -3 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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- VersioningHelper.java 31 Mar 2003 15:23:26 -0000 1.86
+++ VersioningHelper.java 17 May 2003 16:14:01 -0000 1.87
@@ -487,6 +487,8 @@
}
String scope = resourceUrihandler.getAssociatedWorkspaceUri();
+ if( scope == null )
+ scope = UriHandler.bestMatchingScope(nsaToken.getName(), resourceUrihandler).toString();
String historyPath = existingVersionUrihandler.getAssociatedHistoryUri();
SearchQueryResult queryResult = searchResourcesWithGivenHistory(historyPath, scope, Integer.MAX_VALUE);
Iterator queryResultIterator = queryResult.iterator();
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org