Author: tolusha Date: 2011-10-24 06:11:04 -0400 (Mon, 24 Oct 2011) New Revision: 5080 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java Log: EXOJCR-1600: Throw ConstraintViolationException instead of NPE if child node definition is not found Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-10-24 09:29:14 UTC (rev 5079) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-10-24 10:11:04 UTC (rev 5080) @@ -3061,8 +3061,14 @@ def = session.getWorkspace().getNodeTypesHolder().getChildNodeDefinition(nameToAdd, primaryTypeName, parentNode.getPrimaryTypeName(), parentNode.getMixinTypeNames()); + + if (def == null) + { + throw new ConstraintViolationException("Can't find child node definition for " + nameToAdd + " in parent " + + parentNode.getQPath().getAsString()); + } } - + boolean allowSns = def.isAllowsSameNameSiblings(); int ind = 1;