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 2017/10/25 14:04:01 UTC
svn commit: r1813294 - in /jackrabbit/branches/2.14: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
Author: reschke
Date: Wed Oct 25 14:04:01 2017
New Revision: 1813294
URL: http://svn.apache.org/viewvc?rev=1813294&view=rev
Log:
JCR-4185: spi2dav URIResolverImpl should check status code before attempting to parse multistatus (ported to 2.14)
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 25 14:04:01 2017
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1809149,1809329,1809624,1811667
+/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1809149,1809329,1809624,1811667
Modified: jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java?rev=1813294&r1=1813293&r2=1813294&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java Wed Oct 25 14:04:01 2017
@@ -283,12 +283,15 @@ class URIResolverImpl implements URIReso
request = new HttpPropfind(uri, nameSet, DavConstants.DEPTH_0);
HttpResponse response = service.executeRequest(sessionInfo, request);
+ if (response.getStatusLine().getStatusCode() != DavServletResponse.SC_MULTI_STATUS) {
+ throw new ItemNotFoundException("Unable to retrieve the node with id " + uri + ", response status was: "
+ + response.getStatusLine().getStatusCode());
+ }
MultiStatusResponse[] responses = request.getResponseBodyAsMultiStatus(response).getResponses();
if (responses.length != 1) {
throw new ItemNotFoundException("Unable to retrieve the node with id " + uri);
}
return buildNodeId(parentId, uri, responses[0], sessionInfo.getWorkspaceName(), service.getNamePathResolver(sessionInfo));
-
} catch (IOException e) {
throw new RepositoryException(e);
} catch (DavException e) {