Author: sergiykarpenko Date: 2011-03-23 09:00:02 -0400 (Wed, 23 Mar 2011) New Revision: 4166 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java Log: EXOJCR-1234: getNextChildOrderNum() small fixes Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-03-23 12:08:33 UTC (rev 4165) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-03-23 13:00:02 UTC (rev 4166) @@ -968,7 +968,7 @@ int lastOrderNumber = changesLog.getLastChildOrderNumber(parent.getIdentifier()); int lastPersistedNodeOrderNumber = transactionableManager.getLastOrderNumber(parent); - if (lastOrderNumber != -1 && lastPersistedNodeOrderNumber < lastOrderNumber) + if (lastPersistedNodeOrderNumber < lastOrderNumber) { return lastOrderNumber; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java 2011-03-23 12:08:33 UTC (rev 4165) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/DefaultItemDataCopyVisitor.java 2011-03-23 13:00:02 UTC (rev 4166) @@ -264,7 +264,7 @@ protected int calculateNewNodeOrderNumber() throws RepositoryException { - return (dataManager.getLastOrderNumber(curParent()))+1; + return dataManager.getLastOrderNumber(curParent()) + 1; } protected QPath calculateNewNodePath(NodeData node, int level) throws RepositoryException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java 2011-03-23 12:08:33 UTC (rev 4165) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableDataManager.java 2011-03-23 13:00:02 UTC (rev 4166) @@ -121,16 +121,13 @@ int txLastOrderNumber = -1; for (ItemState change : transactionLog.getAllStates()) { - if (change.isNode() && change.isPersisted() + if (change.isNode() && change.isPersisted() && change.isAdded() && change.getData().getParentIdentifier().equals(parent.getIdentifier())) { - if (change.isAdded()) + int orderNumber = ((NodeData)change.getData()).getOrderNumber(); + if (orderNumber > txLastOrderNumber) { - int orderNumber = ((NodeData)change.getData()).getOrderNumber(); - if (orderNumber > txLastOrderNumber) - { - txLastOrderNumber = orderNumber; - } + txLastOrderNumber = orderNumber; } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-03-23 12:08:33 UTC (rev 4165) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-03-23 13:00:02 UTC (rev 4166) @@ -470,6 +470,11 @@ findNodesByParentId.close(); } + if (findLastOrderNumberByParentId != null) + { + findLastOrderNumberByParentId.close(); + } + if (findNodesCountByParentId != null) { findNodesCountByParentId.close(); @@ -945,16 +950,9 @@ ResultSet count = findLastOrderNumberByParentIdentifier(getInternalId(parent.getIdentifier())); try { - if (count.next()) + if (count.next() && count.getInt(1) > 0) { - if (count.getInt(1) > 0) - { - return count.getInt(2); - } - else - { - return -1; - } + return count.getInt(2); } else {