Author: tolusha Date: 2009-12-30 03:22:41 -0500 (Wed, 30 Dec 2009) New Revision: 1249 Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java Log: EXOJCR-338: fix Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java =================================================================== --- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-30 08:18:48 UTC (rev 1248) +++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2009-12-30 08:22:41 UTC (rev 1249) @@ -1014,7 +1014,7 @@ try { return new NodeIteratorOnDemand(childNodesData(), dataManager, nodeData().getPrimaryTypeName(), nodeData() - .getMixinTypeNames(), true); + .getMixinTypeNames()); } finally { @@ -2575,6 +2575,8 @@ { List storedNodes = dataManager.getChildNodesData(nodeData()); + Collections.sort(storedNodes, new NodeDataOrderComparator()); + for (int i = storedNodes.size() - 1; i >= 0; i--) { NodeData node = (NodeData)storedNodes.get(i); @@ -2592,7 +2594,6 @@ } } - Collections.sort(storedNodes, new ObjectOrderComparator()); return storedNodes; } @@ -2990,17 +2991,6 @@ } } - private static class ObjectOrderComparator implements Comparator<Object> - { - public int compare(Object n1, Object n2) - { - int order1 = n1 instanceof NodeData ? ((NodeData)n1).getOrderNumber() : ((NodeImpl)n1).getOrderNumber(); - int order2 = n2 instanceof NodeData ? ((NodeData)n2).getOrderNumber() : ((NodeImpl)n2).getOrderNumber(); - - return order1 - order2; - } - } - // ===================== helpers ===================== private static class NodesOrderComparator implements Comparator<NodeImpl>