Author: sergiykarpenko Date: 2010-03-23 03:23:36 -0400 (Tue, 23 Mar 2010) New Revision: 2097 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableSessionLockManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/CacheableJDBCLockManagerImpl.java Log: EXOJCR-600: HashMap sessionLockManagers HashMap changed to ConcurrentHashMap Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-03-22 13:58:36 UTC (rev 2096) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-03-23 07:23:36 UTC (rev 2097) @@ -74,11 +74,11 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import javax.jcr.RepositoryException; import javax.jcr.lock.LockException; @@ -236,7 +236,7 @@ lockTimeOut = DEFAULT_LOCK_TIMEOUT; } - sessionLockManagers = new HashMap<String, CacheableSessionLockManager>(); + sessionLockManagers = new ConcurrentHashMap<String, CacheableSessionLockManager>(); dataManager.addItemPersistenceListener(this); @@ -566,7 +566,7 @@ nodeIdentifier = currChangesLog.getAllStates().get(0).getData().getParentIdentifier(); CacheableSessionLockManager session = sessionLockManagers.get(sessionId); - if (session != null && session.cotainsPendingLock(nodeIdentifier)) + if (session != null && session.containsPendingLock(nodeIdentifier)) { containers.add(new LockOperationContainer(nodeIdentifier, currChangesLog.getSessionId(), ExtendedEvent.LOCK)); @@ -790,7 +790,7 @@ private synchronized void internalLock(String sessionId, String nodeIdentifier) throws LockException { CacheableSessionLockManager session = sessionLockManagers.get(sessionId); - if (session != null && session.cotainsPendingLock(nodeIdentifier)) + if (session != null && session.containsPendingLock(nodeIdentifier)) { LockData lockData = session.getPendingLock(nodeIdentifier); Fqn<String> lockPath = makeLockFqn(lockData.getNodeIdentifier()); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableSessionLockManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableSessionLockManager.java 2010-03-22 13:58:36 UTC (rev 2096) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableSessionLockManager.java 2010-03-23 07:23:36 UTC (rev 2097) @@ -290,7 +290,7 @@ * @param nodeId - node ID string * @return boolean */ - public boolean cotainsPendingLock(String nodeId) + public boolean containsPendingLock(String nodeId) { return pendingLocks.contains(nodeId); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/CacheableJDBCLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/CacheableJDBCLockManagerImpl.java 2010-03-22 13:58:36 UTC (rev 2096) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/jdbc/CacheableJDBCLockManagerImpl.java 2010-03-23 07:23:36 UTC (rev 2097) @@ -383,7 +383,7 @@ nodeIdentifier = currChangesLog.getAllStates().get(0).getData().getParentIdentifier(); CacheableSessionLockManager session = sessionLockManagers.get(sessionId); - if (session != null && session.cotainsPendingLock(nodeIdentifier)) + if (session != null && session.containsPendingLock(nodeIdentifier)) { containers.add(new LockOperationContainer(nodeIdentifier, currChangesLog.getSessionId(), ExtendedEvent.LOCK)); @@ -642,7 +642,7 @@ private synchronized void internalLock(String sessionId, String nodeIdentifier) throws RepositoryException { CacheableSessionLockManager sessionLockManager = sessionLockManagers.get(sessionId); - if (sessionLockManager != null && sessionLockManager.cotainsPendingLock(nodeIdentifier)) + if (sessionLockManager != null && sessionLockManager.containsPendingLock(nodeIdentifier)) { LockData lockData = sessionLockManager.getPendingLock(nodeIdentifier);