Author: areshetnyak Date: 2009-11-12 10:43:12 -0500 (Thu, 12 Nov 2009) New Revision: 607 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/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.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 15:32:31 UTC (rev 606) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-12 15:43:12 UTC (rev 607) @@ -292,8 +292,8 @@ else if (m.getType() == ModificationType.REMOVE_NODE) { if (m.getFqn().size() == 2 - && (m.getFqn().get(1).equals(JBossCacheStorage.NODES) - || m.getFqn().get(1).equals(JBossCacheStorage.PROPS))) + && (m.getFqn().get(0).equals(JBossCacheStorage.NODES) + || m.getFqn().get(0).equals(JBossCacheStorage.PROPS))) { String id = (String) m.getFqn().get(1); ItemData removedItemData = jdbcConnection.getItemData(id); Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 15:32:31 UTC (rev 606) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java 2009-11-12 15:43:12 UTC (rev 607) @@ -524,9 +524,28 @@ { // prepare - + WorkspaceStorageConnection conn = persistentContainer.openConnection(); + + String nodeId = IdGenerator.generate(); + addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null); + conn.commit(); + + List<Modification> modifications = new ArrayList<Modification>(); + + conn = persistentContainer.openConnection(); + + NodeData nodeData = (NodeData) conn.getItemData(nodeId); + + modifications.addAll(removeNode(nodeData)); + + loader.put(modifications); + // tests it - + conn = persistentContainer.openConnection(); + + NodeData removedNodeData = (NodeData) conn.getItemData(nodeData.getIdentifier()); + + assertNull(removedNodeData); } public void testUpdateProperty() throws Exception