Author: areshetnyak Date: 2009-11-12 03:40:48 -0500 (Thu, 12 Nov 2009) New Revision: 582 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java Log: EXOJCR-201 : The JDBCCacheLoader was changed. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-12 08:35:27 UTC (rev 581) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-12 08:40:48 UTC (rev 582) @@ -264,23 +264,24 @@ for (int i = 0; i < modifications.size(); i++) { - if (modifications.get(i).getType() == ModificationType.PUT_KEY_VALUE) + Modification m = modifications.get(i); + if (m.getType() == ModificationType.PUT_KEY_VALUE) { ItemData itemData = null; //Check add or update node data. - if (modifications.get(i).getValue() instanceof NodeData) + if (m.getValue() instanceof NodeData) { - NodeData nodeData = (NodeData) modifications.get(i).getValue(); + NodeData nodeData = (NodeData) m.getValue(); itemData = jdbcConnection.getItemData(nodeData.getIdentifier()); // Set oldValueData for update node. if (itemData != null) modifications.get(i).setOldValue(itemData); } - else if (modifications.get(i).getValue() instanceof PropertyData) + else if (m.getValue() instanceof PropertyData) { - PropertyData propertyData = (PropertyData) modifications.get(i).getValue(); + PropertyData propertyData = (PropertyData) m.getValue(); itemData = jdbcConnection.getItemData(propertyData.getIdentifier()); // Set oldValueData for update property. @@ -288,14 +289,17 @@ modifications.get(i).setOldValue(itemData); } } - else if (modifications.get(i).getType() == ModificationType.REMOVE_NODE) + else if (m.getType() == ModificationType.REMOVE_NODE) { - if (modifications.get(i).getValue() instanceof ItemData) { - String id = ((ItemData) (modifications.get(i).getValue())).getIdentifier(); + if (m.getFqn().size() == 2 + && (m.getFqn().get(1).equals(JBossCacheStorage.NODES) + || m.getFqn().get(1).equals(JBossCacheStorage.PROPS))) + { + String id = (String) m.getFqn().get(1); ItemData removedItemData = jdbcConnection.getItemData(id); - + // Set valueData for update property or node. - if (removedItemData != null) + if (removedItemData != null) modifications.get(i).setValue(removedItemData); } }