[exo-jcr-commits] exo-jcr SVN: r778 - 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: pnedonosko
Date: 2009-11-19 09:55:06 -0500 (Thu, 19 Nov 2009)
New Revision: 778

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/AbstractJBossCacheStorageConnectionTest.java
Log:
EXOJCR-203: JBC init fix in test

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-19 14:40:34 UTC (rev 777)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java	2009-11-19 14:55:06 UTC (rev 778)
@@ -637,7 +637,8 @@
     */
    public Object put(Fqn name, Object key, Object value) throws Exception
    {
-      LOG.error("The method 'put(Fqn name, Object key, Object value))' should not be called.");
+      LOG.error("The method 'put(Fqn name, Object key, Object value))' should not be called. " + name + " " + key + " "
+         + value);
       throw new JDBCCacheLoaderException("The method 'put(Fqn name, Object key, Object value))' should not be called.");
    }
 
@@ -646,7 +647,8 @@
     */
    public void put(Fqn name, Map<Object, Object> attributes) throws Exception
    {
-      LOG.error("The method 'put(Fqn name, Map<Object, Object> attributes)' should not be called.");
+      LOG.error("The method 'put(Fqn name, Map<Object, Object> attributes)' should not be called. " + name + " "
+         + attributes);
       throw new JDBCCacheLoaderException(
          "The method 'put(Fqn name, Map<Object, Object> attributes)' should not be called.");
    }
@@ -656,7 +658,7 @@
     */
    public Object remove(Fqn fqn, Object key) throws Exception
    {
-      LOG.error("The method 'remove(Fqn fqn, Object key)' should not be called.");
+      LOG.error("The method 'remove(Fqn fqn, Object key)' should not be called. " + fqn + " " + key);
       throw new JDBCCacheLoaderException("The method 'remove(Fqn fqn, Object key)' should not be called.");
    }
 
@@ -665,7 +667,7 @@
     */
    public void remove(Fqn fqn) throws Exception
    {
-      LOG.error("The method 'remove(Fqn fqn)' should not be called.");
+      LOG.error("The method 'remove(Fqn fqn)' should not be called. " + fqn);
       throw new JDBCCacheLoaderException("The method 'remove(Fqn fqn)' should not be called.");
    }
 
@@ -674,7 +676,7 @@
     */
    public void removeData(Fqn fqn) throws Exception
    {
-      LOG.error("The method 'removeData(Fqn fqn)' should not be called.");
+      LOG.error("The method 'removeData(Fqn fqn)' should not be called. " + fqn);
       throw new JDBCCacheLoaderException("The method 'removeData(Fqn fqn)' should not be called.");
    }
 

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractJBossCacheStorageConnectionTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractJBossCacheStorageConnectionTest.java	2009-11-19 14:40:34 UTC (rev 777)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractJBossCacheStorageConnectionTest.java	2009-11-19 14:55:06 UTC (rev 778)
@@ -80,10 +80,11 @@
       Node<Serializable, Object> cacheRoot = cache.getRoot();
 
       // prepare cache structures
+      cache.startBatch();
       nodes = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.NODES));
       props = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.PROPS));
       locks = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.LOCKS));
-
+      cache.endBatch(true);
       // JCR connection
       conn = new JBossCacheStorageConnection(cache, nodes, props, locks);
    }