Author: angela
Date: Wed Apr 10 12:29:29 2019
New Revision: 1857242
URL: http://svn.apache.org/viewvc?rev=1857242&view=rev
Log:
OAK-8212 : ImporterImpl.importProperties prone to NPE
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/xml/ImportTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1857242&r1=1857241&r2=1857242&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Wed Apr 10 12:29:29 2019
@@ -272,6 +272,9 @@ public class ImporterImpl implements Imp
//TODO find better heuristics?
EffectiveNodeType ent =
effectiveNodeTypeProvider.getEffectiveNodeType(tree);
PropertyDefinition def = ent.getPropertyDefinition(pi.getName(),
pi.getType(), pi.isUnknownMultiple());
+ if (def == null) {
+ throw new ConstraintViolationException("No matching property
definition found for " + pi.getName());
+ }
if (def.isProtected()) {
// skip protected property
log.debug("Protected property {}", pi.getName());
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/xml/ImportTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/xml/ImportTest.java?rev=1857242&r1=1857241&r2=1857242&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/xml/ImportTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/xml/ImportTest.java
Wed Apr 10 12:29:29 2019
@@ -29,6 +29,9 @@ import javax.jcr.nodetype.ConstraintViol
import org.apache.jackrabbit.test.AbstractJCRTest;
+import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
+import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
+
public class ImportTest extends AbstractJCRTest {
private String uuid;
@@ -226,4 +229,23 @@ public class ImportTest extends Abstract
// success
}
}
+
+ /**
+ * @see <a
href="https://issues.apache.org/jira/browse/OAK-8212";>OAK-8212</a>
+ */
+ public void testNoMatchingPropertyDefinition() throws Exception {
+ // jcr:data must be BINARY not BOOLEAN -> should fail
+ String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ "<sv:node sv:name=\"resourceName\"
xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\";
xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\";
xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\";
xmlns:fn=\"http://www.w3.org/2005/xpath-functions\";
xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\"; xmlns:rep=\"internal\"
xmlns:jcr=\"http://www.jcp.org/jcr/1.0\";>" +
+ "<sv:property sv:name=\"jcr:primaryType\"
sv:type=\"Name\"><sv:value>oak:Resource</sv:value></sv:property>" +
+ "<sv:property sv:name=\"jcr:data\"
sv:type=\"Boolean\"><sv:value>true</sv:value></sv:property>" +
+ "</sv:node>";
+ try {
+ superuser.importXML(path, new
ByteArrayInputStream(xml.getBytes()),
ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW);
+ fail("ConstraintViolationException expected");
+ } catch (ConstraintViolationException e) {
+ // success
+ assertEquals("No matching property definition found for jcr:data",
e.getMessage());
+ }
+ }
}
\ No newline at end of file
