[exo-jcr-commits] exo-jcr SVN: r1528 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache.

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2010-01-21 09:08:44 -0500 (Thu, 21 Jan 2010)
New Revision: 1528

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
Log:
EXOJCR-332 : Add constructor without TransactionManager or TransactionService

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java	2010-01-21 13:59:14 UTC (rev 1527)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java	2010-01-21 14:08:44 UTC (rev 1528)
@@ -188,6 +188,21 @@
     * @param dataManager - workspace persistent data manager
     * @param config - workspace entry
     * @param context InitialContextInitializer, needed to reload context after JBoss cache creation
+    * @throws RepositoryConfigurationException
+    */
+   public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,
+            InitialContextInitializer context)
+            throws RepositoryConfigurationException
+   {
+      this(dataManager, config, context, (TransactionManager)null);
+   }
+   
+   /**
+    * Constructor.
+    * 
+    * @param dataManager - workspace persistent data manager
+    * @param config - workspace entry
+    * @param context InitialContextInitializer, needed to reload context after JBoss cache creation
     * @param transactionManager 
     *          the transaction manager
     * @throws RepositoryConfigurationException
@@ -215,7 +230,9 @@
 
       }
       else
+      {
          lockTimeOut = DEFAULT_LOCK_TIMEOUT;
+      }
 
       pendingLocks = new HashMap<String, LockData>();
       sessionLockManagers = new HashMap<String, CacheableSessionLockManager>();
@@ -235,8 +252,12 @@
          CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
 
          cache = factory.createCache(pathToConfig, false);
-         cache.getConfiguration().getRuntimeConfig().setTransactionManager(transactionManager);
          
+         if (transactionManager != null)
+         {
+            cache.getConfiguration().getRuntimeConfig().setTransactionManager(transactionManager);
+         }
+         
          cache.create();
          cache.start();