[exo-jcr-commits] exo-jcr SVN: r660 - in jcr/branches/1.12.0-JBC/component/core/src: test/java/org/exoplatform/services/jcr/impl/storage/jbosscache and 1 other directory.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2009-11-13 09:53:41 -0500 (Fri, 13 Nov 2009)
New Revision: 660

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-13 14:18:36 UTC (rev 659)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java	2009-11-13 14:53:41 UTC (rev 660)
@@ -118,6 +118,7 @@
               case REMOVE_NODE:
                  
                  doRemove(m, jdbcConnection);
+                 
                  break;
               case MOVE:
                  break;
@@ -158,8 +159,8 @@
             throws IllegalStateException, RepositoryException
    {
 
-      if (modification.getFqn().get(0).equals(JBossCacheStorage.NODES) ||
-          modification.getFqn().get(0).equals(JBossCacheStorage.PROPS))
+      if ( modification.getFqn().size() == 2 && (modification.getFqn().get(0).equals(JBossCacheStorage.NODES) ||
+          modification.getFqn().get(0).equals(JBossCacheStorage.PROPS)))
       {
       
          String identifier = (String) modification.getFqn().get(1);

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-13 14:18:36 UTC (rev 659)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java	2009-11-13 14:53:41 UTC (rev 660)
@@ -455,10 +455,13 @@
 
       // prepare
       WorkspaceStorageConnection conn = persistentContainer.openConnection();
-
+      QPath baseNodePath = QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]baseNode"));
+      String baseNodeId = IdGenerator.generate();
+      addDbNode(conn, baseNodePath, baseNodeId,Constants.NT_UNSTRUCTURED, Constants.ROOT_UUID);
+      
+      // add child nodes [node1] 
       String nodeId = IdGenerator.generate();
-      addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId,
-         Constants.NT_UNSTRUCTURED, Constants.ROOT_UUID);
+      addDbNode(conn, QPath.makeChildPath(baseNodePath, InternalQName.parse("[]node1")), nodeId, Constants.NT_UNSTRUCTURED, baseNodeId);
       conn.commit();
 
       List<Modification> modifications = new ArrayList<Modification>();