Author: sergiykarpenko Date: 2010-03-23 09:47:01 -0400 (Tue, 23 Mar 2010) New Revision: 2103 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java Log: EXOJCR-587: NPE in doOrderBefore fixed 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 2010-03-23 12:13:21 UTC (rev 2102) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2010-03-23 13:47:01 UTC (rev 2103) @@ -2374,7 +2374,7 @@ srcInd = i; } } - if (destInd == -1 && destPath != null) + if (destPath != null && destInd == -1) { if (nodeData.getQPath().getName().equals(destPath.getName()) && (nodeData.getQPath().getIndex() == destPath.getIndex() || destPath.getIndex() == 0 @@ -2495,7 +2495,10 @@ } } // delete state first - dataManager.getChangesLog().add(deleteState); + if (deleteState != null) + { + dataManager.getChangesLog().add(deleteState); + } dataManager.getChangesLog().addAll(changes); }