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 mr...@apache.org on 2017/07/03 09:47:52 UTC
svn commit: r1800613 - in /jackrabbit/oak/trunk/oak-jcr/src:
main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
Author: mreutegg
Date: Mon Jul 3 09:47:52 2017
New Revision: 1800613
URL: http://svn.apache.org/viewvc?rev=1800613&view=rev
Log:
OAK-6410: NPE when removing inexistent property from checked in node
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.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/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1800613&r1=1800612&r2=1800613&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java Mon Jul 3 09:47:52 2017
@@ -1446,7 +1446,9 @@ public class NodeImpl<T extends NodeDele
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
PropertyDelegate property = dlg.getPropertyOrNull(oakName);
- if (!isCheckedOut() && getOPV(dlg.getTree(), property.getPropertyState()) != OnParentVersionAction.IGNORE) {
+ if (property != null &&
+ !isCheckedOut() &&
+ getOPV(dlg.getTree(), property.getPropertyState()) != OnParentVersionAction.IGNORE) {
throw new VersionException(format(
"Cannot remove property. Node [%s] is checked in.", getNodePath()));
}
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=1800613&r1=1800612&r2=1800613&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 Mon Jul 3 09:47:52 2017
@@ -1225,7 +1225,6 @@ public class RepositoryTest extends Abst
}
// OAK-6410
- @Ignore("OAK-6410")
@Test
public void setInexistentProperty() throws RepositoryException {
Node node = getNode(TEST_PATH);