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/18 16:30:44 UTC
svn commit: r1833734 - in /jackrabbit/branches/2.14: ./
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
Author: reschke
Date: Mon Jun 18 16:30:43 2018
New Revision: 1833734
URL: http://svn.apache.org/viewvc?rev=1833734&view=rev
Log:
JCR-4292: davex: preserve cause in exceptions and log affected URI (ported to 2.14)
Modified:
jackrabbit/branches/2.14/ (props changed)
jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java
jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 18 16:30:43 2018
@@ -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,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1833374
+/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,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1833374
Modified: jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java?rev=1833734&r1=1833733&r2=1833734&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java Mon Jun 18 16:30:43 2018
@@ -105,7 +105,7 @@ class ItemInfoJsonHandler implements Jso
nodeInfos.push(nInfo);
propInfoLists.push(new ArrayList<PropertyInfoImpl>(8));
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
}
@@ -132,7 +132,7 @@ class ItemInfoJsonHandler implements Jso
log.debug("Incomplete NodeInfo '"+ nInfo.getPath() + "' -> Only present as ChildInfo with its parent.");
}
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
} finally {
// reset all node-related handler state
name = null;
@@ -163,7 +163,7 @@ class ItemInfoJsonHandler implements Jso
propInfo.checkCompleted();
getCurrentPropInfos().add(propInfo);
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
} finally {
// reset property-related handler state
propertyType = PropertyType.UNDEFINED;
@@ -202,7 +202,7 @@ class ItemInfoJsonHandler implements Jso
index = Path.INDEX_DEFAULT;
}
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
@@ -240,7 +240,7 @@ class ItemInfoJsonHandler implements Jso
}
value(v);
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
@@ -252,7 +252,7 @@ class ItemInfoJsonHandler implements Jso
try {
value(vFactory.create(value));
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
@@ -282,7 +282,7 @@ class ItemInfoJsonHandler implements Jso
int indx = (!multiValuedProperty) ? -1 : propValues.size();
value(vFactory.create(value, getValueURI(), indx));
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
return;
@@ -290,7 +290,7 @@ class ItemInfoJsonHandler implements Jso
try {
value(vFactory.create(value));
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
@@ -302,7 +302,7 @@ class ItemInfoJsonHandler implements Jso
try {
value(vFactory.create(value));
} catch (RepositoryException e) {
- throw new IOException(e.getMessage());
+ throw new IOException(e.getMessage(), e);
}
}
Modified: jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java?rev=1833734&r1=1833733&r2=1833734&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java Mon Jun 18 16:30:43 2018
@@ -380,8 +380,8 @@ public class RepositoryServiceImpl exten
throw ExceptionConverter.generate(new DavException(statusCode, "Unable to retrieve NodeInfo for " + uri), request);
}
} catch (IOException e) {
- log.error("Internal error while retrieving NodeInfo.",e);
- throw new RepositoryException(e.getMessage());
+ log.error("Internal error while retrieving NodeInfo for " + uri + ".", e);
+ throw new RepositoryException(e.getMessage(), e);
} finally {
request.releaseConnection();
}
@@ -438,8 +438,8 @@ public class RepositoryServiceImpl exten
return super.getPropertyInfo(sessionInfo, propertyId);
}
} catch (IOException e) {
- log.error("Internal error while retrieving ItemInfo.",e);
- throw new RepositoryException(e.getMessage());
+ log.error("Internal error while retrieving ItemInfo for " + uri + ".", e);
+ throw new RepositoryException(e.getMessage(), e);
} catch (DavException e) {
throw ExceptionConverter.generate(e);
} finally {