Author: pnedonosko
Date: 2009-09-23 04:53:55 -0400 (Wed, 23 Sep 2009)
New Revision: 183
Modified:
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java
Log:
EXOJCR-159 : NodeHierarchyCreatorImpl should not use empty paths (2)
Modified:
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java
===================================================================
---
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2009-09-23
07:35:13 UTC (rev 182)
+++
jcr/trunk/component/ext/src/main/java/org/exoplatform/services/jcr/ext/hierarchy/impl/NodeHierarchyCreatorImpl.java 2009-09-23
08:53:55 UTC (rev 183)
@@ -97,29 +97,28 @@
Node node = rootNode;
for (String token : path.split("/"))
{
- if (token.length() == 0)
+ if (token.length() > 0)
{
- continue;
- }
- try
- {
- node = node.getNode(token);
- }
- catch (PathNotFoundException e)
- {
- if (nodeType == null || nodeType.length() == 0)
- nodeType = NT_UNSTRUCTURED;
- node = node.addNode(token, nodeType);
- if (node.canAddMixin("exo:privilegeable"))
- node.addMixin("exo:privilegeable");
- if (permissions != null && !permissions.isEmpty())
- ((ExtendedNode)node).setPermissions(permissions);
- if (mixinTypes.size() > 0)
+ try
{
- for (String mixin : mixinTypes)
+ node = node.getNode(token);
+ }
+ catch (PathNotFoundException e)
+ {
+ if (nodeType == null || nodeType.length() == 0)
+ nodeType = NT_UNSTRUCTURED;
+ node = node.addNode(token, nodeType);
+ if (node.canAddMixin("exo:privilegeable"))
+ node.addMixin("exo:privilegeable");
+ if (permissions != null && !permissions.isEmpty())
+ ((ExtendedNode)node).setPermissions(permissions);
+ if (mixinTypes.size() > 0)
{
- if (node.canAddMixin(mixin))
- node.addMixin(mixin);
+ for (String mixin : mixinTypes)
+ {
+ if (node.canAddMixin(mixin))
+ node.addMixin(mixin);
+ }
}
}
}
Show replies by date