[exo-jcr-commits] exo-jcr SVN: r661 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2009-11-13 10:01:15 -0500 (Fri, 13 Nov 2009)
New Revision: 661

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-13 14:53:41 UTC (rev 660)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java	2009-11-13 15:01:15 UTC (rev 661)
@@ -163,9 +163,11 @@
           modification.getFqn().get(0).equals(JBossCacheStorage.PROPS)))
       {
       
-         String identifier = (String) modification.getFqn().get(1);
-      
-         ItemData itemData = jdbcConnection.getItemData(identifier);
+//         String identifier = (String) modification.getFqn().get(1);
+//         ItemData itemData = jdbcConnection.getItemData(identifier);
+         
+         // TODO the removed ItemData is setting in value in prepareModifications();
+         ItemData itemData = (ItemData) modification.getValue();
    
          if (itemData instanceof NodeData)
             jdbcConnection.delete((NodeData) itemData);
@@ -271,8 +273,7 @@
                   modifications.get(i).setOldValue(itemData);
             } 
          }
-         //TODO for REMOVE is not need removed ItemData
-         /*else if (m.getType() == ModificationType.REMOVE_NODE)
+         else if (m.getType() == ModificationType.REMOVE_NODE)
          {
             if (m.getFqn().size() == 2
                      && (m.getFqn().get(0).equals(JBossCacheStorage.NODES) 
@@ -285,7 +286,7 @@
                if (removedItemData != null)
                   modifications.get(i).setValue(removedItemData);
             }
-         }*/
+         }
       }
    }