[exo-jcr-commits] exo-jcr SVN: r1389 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl.

[do-not-reply at jboss.org]

Author: sergiykarpenko
Date: 2010-01-14 08:56:17 -0500 (Thu, 14 Jan 2010)
New Revision: 1389

Modified:
   jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
Log:
EXOJCR-332: CacheableLockManager added to RepositoryContainer 


Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java	2010-01-14 13:22:18 UTC (rev 1388)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java	2010-01-14 13:56:17 UTC (rev 1389)
@@ -41,6 +41,7 @@
 import org.exoplatform.services.jcr.impl.core.WorkspaceInitializer;
 import org.exoplatform.services.jcr.impl.core.access.DefaultAccessManagerImpl;
 import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl;
+import org.exoplatform.services.jcr.impl.core.lock.cache.CacheableLockManager;
 import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeDataManagerImpl;
 import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl;
 import org.exoplatform.services.jcr.impl.core.nodetype.registration.JCRNodeTypeDataPersister;
@@ -265,8 +266,16 @@
                   + " : " + e);
             }
          }
-         workspaceContainer.registerComponentImplementation(LockManagerImpl.class);
 
+         if (wsConfig.getLockManager() != null)
+         {
+            workspaceContainer.registerComponentImplementation(CacheableLockManager.class);
+         }
+         else
+         {
+            workspaceContainer.registerComponentImplementation(LockManagerImpl.class);
+         }
+
          // Query handler
          if (wsConfig.getQueryHandler() != null)
          {