You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/08/28 16:24:58 UTC
svn commit: r1866041 - in /jackrabbit/oak/trunk/oak-jcr/src:
main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
Author: reschke
Date: Wed Aug 28 16:24:58 2019
New Revision: 1866041
URL: http://svn.apache.org/viewvc?rev=1866041&view=rev
Log:
OAK-8583: getNodeByIdentifier may fail with RuntimeException
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java?rev=1866041&r1=1866040&r2=1866041&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java Wed Aug 28 16:24:58 2019
@@ -320,11 +320,15 @@ public class SessionImpl implements Jack
@NotNull
@Override
public Node perform() throws RepositoryException {
- NodeDelegate nd = sd.getNodeByIdentifier(id);
- if (nd == null) {
- throw new ItemNotFoundException("Node with id " + id + " does not exist.");
+ try {
+ NodeDelegate nd = sd.getNodeByIdentifier(id);
+ if (nd == null) {
+ throw new ItemNotFoundException("Node with id " + id + " does not exist.");
+ }
+ return NodeImpl.createNode(nd, sessionContext);
+ } catch (IllegalArgumentException ex) {
+ throw new RepositoryException(ex);
}
- return NodeImpl.createNode(nd, sessionContext);
}
});
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java?rev=1866041&r1=1866040&r2=1866041&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java Wed Aug 28 16:24:58 2019
@@ -387,7 +387,6 @@ public class RepositoryTest extends Abst
}
}
- @Ignore
@Test
public void getNodeByEmptyIdentifier() throws RepositoryException {
try {