Author: areshetnyak
Date: 2011-08-11 04:46:44 -0400 (Thu, 11 Aug 2011)
New Revision: 4736
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
Log:
EXOJCR-1468 : Clean code.
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-08-11
08:03:20 UTC (rev 4735)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2011-08-11
08:46:44 UTC (rev 4736)
@@ -297,15 +297,15 @@
if (nodeDef.getName().equals(name) ||
primaryTypeName.equals(Constants.JCR_ANY_NAME))
{
- if (nodeDef.getDefaultPrimaryType() == null)
+ primaryTypeName = nodeDef.getDefaultPrimaryType();
+
+ if (primaryTypeName == null)
{
throw new ConstraintViolationException("Can not define node type for
" + name.getAsString()
+ ". No default primary type defined for child nodes in
\""
+ nodeData().getPrimaryTypeName().getAsString()
+ "\" node type and no explicit primary type given to
create a child node.");
}
-
- primaryTypeName = nodeDef.getDefaultPrimaryType();
}
// try to make new node
return doAddNode(parent, name, primaryTypeName, nodeDef);
Show replies by date