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/05/02 13:14:52 UTC
svn commit: r1830753 - in
/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex:
ItemInfoJSONHandler.java RepositoryServiceImpl.java
Author: reschke
Date: Wed May 2 13:14:52 2018
New Revision: 1830753
URL: http://svn.apache.org/viewvc?rev=1830753&view=rev
Log:
JCR-4292: davex: preserve cause in exceptions and log affected URI
Modified:
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java?rev=1830753&r1=1830752&r2=1830753&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoJSONHandler.java Wed May 2 13:14:52 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/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java?rev=1830753&r1=1830752&r2=1830753&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java Wed May 2 13:14:52 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 {