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 2018/06/11 12:23:39 UTC
svn commit: r1833318 - in /jackrabbit/branches/2.8: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
Author: reschke
Date: Mon Jun 11 12:23:39 2018
New Revision: 1833318
URL: http://svn.apache.org/viewvc?rev=1833318&view=rev
Log:
JCR-4185: spi2dav URIResolverImpl should check status code before attempting to parse multistatus (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 11 12:23:39 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808754,1810108,1811667,1814831,1817097,1821597,1822947,1822950,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1810108,1811667,1814831,1817097,1821597,1822947,1822950,1826230,1826647,1826940,1826964
Modified: jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java?rev=1833318&r1=1833317&r2=1833318&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/URIResolverImpl.java Mon Jun 11 12:23:39 2018
@@ -280,13 +280,15 @@ class URIResolverImpl implements URIReso
try {
method = new PropFindMethod(uri, nameSet, DavConstants.DEPTH_0);
- service.getClient(sessionInfo).executeMethod(method);
+ int status = service.getClient(sessionInfo).executeMethod(method);
+ if (status != DavServletResponse.SC_MULTI_STATUS) {
+ throw new ItemNotFoundException("Unable to retrieve the node with id " + uri + ", response status was: " + status);
+ }
MultiStatusResponse[] responses = method.getResponseBodyAsMultiStatus().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) {