You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2013/04/19 15:07:33 UTC
svn commit: r1469815 - in /jackrabbit/branches/2.6: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Author: reschke
Date: Fri Apr 19 13:07:33 2013
New Revision: 1469815
URL: http://svn.apache.org/r1469815
Log:
JCR-3575: use absolute paths in WebDAV request bodies (DAV:href elements) (ported to 2.6)
Modified:
jackrabbit/branches/2.6/ (props changed)
jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1469799
Modified: jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=1469815&r1=1469814&r2=1469815&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Fri Apr 19 13:07:33 2013
@@ -867,7 +867,7 @@ public class RepositoryServiceImpl imple
public boolean isGranted(SessionInfo sessionInfo, ItemId itemId, String[] actions) throws RepositoryException {
ReportMethod method = null;
try {
- String uri = getItemUri(itemId, sessionInfo);
+ String uri = obtainAbsolutePathFromUri(getItemUri(itemId, sessionInfo));
ReportInfo reportInfo = new ReportInfo(JcrRemotingConstants.REPORT_PRIVILEGES, ItemResourceConstants.NAMESPACE);
reportInfo.setContentElement(DomUtil.hrefToXml(uri, DomUtil.createDocument()));
@@ -1797,7 +1797,11 @@ public class RepositoryServiceImpl imple
uInfo = new UpdateInfo(uElem);
} else {
- uInfo = new UpdateInfo(updateSource, updateType, new DavPropertyNameSet());
+ String tmpUpdateSource[] = new String[updateSource.length];
+ for (int i = 0; i < updateSource.length; i++) {
+ tmpUpdateSource[i] = obtainAbsolutePathFromUri(updateSource[i]);
+ }
+ uInfo = new UpdateInfo(tmpUpdateSource, updateType, new DavPropertyNameSet());
}
UpdateMethod method = new UpdateMethod(uri, uInfo);