[exo-jcr-commits] exo-jcr SVN: r1436 - in jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock: jbosscache and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Jan 16 10:10:13 EST 2010
Author: sergiykarpenko
Date: 2010-01-16 10:10:12 -0500 (Sat, 16 Jan 2010)
New Revision: 1436
Modified:
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java
jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
Log:
EXOJCR-332: getLockData fixed
Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2010-01-16 14:49:12 UTC (rev 1435)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2010-01-16 15:10:12 UTC (rev 1436)
@@ -38,7 +38,7 @@
private SessionImpl session;
- // TODO remove this construector, need refactor lock classes ierarchy
+ // TODO remove this constructor, need refactor lock classes ierarchy
public LockImpl()
{
}
Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java
===================================================================
--- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-16 14:49:12 UTC (rev 1435)
+++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManager.java 2010-01-16 15:10:12 UTC (rev 1436)
@@ -86,9 +86,7 @@
*/
@Managed
@NameTemplate(@Property(key = "service", value = "lockmanager"))
-public class CacheableLockManager
- extends AbstractLockManager
- implements ItemsPersistenceListener, Startable
+public class CacheableLockManager extends AbstractLockManager implements ItemsPersistenceListener, Startable
{
/**
* The name to property time out.
@@ -172,16 +170,16 @@
* @param config
*/
public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config)
- throws RepositoryConfigurationException
+ throws RepositoryConfigurationException
{
this(dataManager, config, null);
}
public CacheableLockManager(WorkspacePersistentDataManager dataManager, WorkspaceEntry config,
- LockPersister persister) throws RepositoryConfigurationException
+ LockPersister persister) throws RepositoryConfigurationException
{
- List<SimpleParameterEntry> paramenerts = config.getLockManager().getParameters();
-
+ List<SimpleParameterEntry> paramenerts = config.getLockManager().getParameters();
+
this.dataManager = dataManager;
if (config.getLockManager() != null)
{
@@ -193,8 +191,7 @@
else
{
lockTimeOut =
- config.getLockManager().getTimeout() > 0 ? config.getLockManager().getTimeout()
- : DEFAULT_LOCK_TIMEOUT;
+ config.getLockManager().getTimeout() > 0 ? config.getLockManager().getTimeout() : DEFAULT_LOCK_TIMEOUT;
}
}
@@ -208,11 +205,13 @@
// make cache
if (config.getLockManager() != null
- && (config.getLockManager().getCacheConfig() != null || (paramenerts != null && config
- .getLockManager().getParameterValue(JBOSSCACCHE_CONFIG, null) != null)))
+ && (config.getLockManager().getCacheConfig() != null || (paramenerts != null && config.getLockManager()
+ .getParameterValue(JBOSSCACCHE_CONFIG, null) != null)))
{
- String pathToConfig = (paramenerts != null && config.getLockManager().getParameterValue(JBOSSCACCHE_CONFIG, null) != null) ? config.getLockManager()
- .getParameterValue(JBOSSCACCHE_CONFIG) : config.getLockManager().getCacheConfig();
+ String pathToConfig =
+ (paramenerts != null && config.getLockManager().getParameterValue(JBOSSCACCHE_CONFIG, null) != null)
+ ? config.getLockManager().getParameterValue(JBOSSCACCHE_CONFIG) : config.getLockManager()
+ .getCacheConfig();
CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>();
cache = factory.createCache(pathToConfig, false);
cache.create();
@@ -241,9 +240,9 @@
* .jcr.impl.core.NodeImpl, boolean, boolean, long)
*/
public synchronized Lock addPendingLock(NodeImpl node, boolean isDeep, boolean isSessionScoped, long timeOut)
- throws LockException
+ throws LockException
{
- LockData lData = getLockData((NodeData) node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT);
+ LockData lData = getLockData((NodeData)node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT);
if (lData != null)
{
if (lData.getNodeIdentifier().equals(node.getInternalIdentifier()))
@@ -256,7 +255,7 @@
}
}
- if (isDeep && getLockData((NodeData) node.getData(), SEARCH_CLOSEDCHILD) != null)
+ if (isDeep && getLockData((NodeData)node.getData(), SEARCH_CLOSEDCHILD) != null)
{
throw new LockException("Some child node is locked.");
}
@@ -291,7 +290,7 @@
public LockImpl getLock(NodeImpl node) throws LockException, RepositoryException
{
- LockData lData = getLockData((NodeData) node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT);
+ LockData lData = getLockData((NodeData)node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT);
if (lData == null || (!node.getInternalIdentifier().equals(lData.getNodeIdentifier()) && !lData.isDeep()))
{
@@ -363,7 +362,7 @@
*/
public boolean isLockHolder(NodeImpl node) throws RepositoryException
{
- LockData lData = getLockData((NodeData) node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT);
+ LockData lData = getLockData((NodeData)node.getData(), SEARCH_EXECMATCH | SEARCH_CLOSEDPARENT);
return lData != null && isLockHolder(node.getSession().getId(), lData.getTokenHash());
}
@@ -383,7 +382,7 @@
*/
public synchronized void onCloseSession(ExtendedSession session)
{
- SessionImpl sessionImpl = (SessionImpl) session;
+ SessionImpl sessionImpl = (SessionImpl)session;
for (LockData lockData : getLockList())
{
@@ -396,8 +395,8 @@
// if no session currently holds lock except this
try
{
- ((NodeImpl) sessionImpl.getTransientNodesManager().getItemByIdentifier(lockData.getNodeIdentifier(),
- false)).unlock();
+ ((NodeImpl)sessionImpl.getTransientNodesManager().getItemByIdentifier(lockData.getNodeIdentifier(),
+ false)).unlock();
}
catch (UnsupportedRepositoryOperationException e)
{
@@ -435,7 +434,7 @@
List<PlainChangesLog> chengesLogList = new ArrayList<PlainChangesLog>();
if (changesLog instanceof TransactionChangesLog)
{
- ChangesLogIterator logIterator = ((TransactionChangesLog) changesLog).getLogIterator();
+ ChangesLogIterator logIterator = ((TransactionChangesLog)changesLog).getLogIterator();
while (logIterator.hasNextLog())
{
@@ -444,11 +443,11 @@
}
else if (changesLog instanceof PlainChangesLog)
{
- chengesLogList.add((PlainChangesLog) changesLog);
+ chengesLogList.add((PlainChangesLog)changesLog);
}
else if (changesLog instanceof CompositeChangesLog)
{
- for (ChangesLogIterator iter = ((CompositeChangesLog) changesLog).getLogIterator(); iter.hasNextLog();)
+ for (ChangesLogIterator iter = ((CompositeChangesLog)changesLog).getLogIterator(); iter.hasNextLog();)
{
chengesLogList.add(iter.nextLog());
}
@@ -465,7 +464,7 @@
if (currChangesLog.getSize() < 2)
{
log.error("Incorrect changes log of type ExtendedEvent.LOCK size=" + currChangesLog.getSize()
- + "<2 \n" + currChangesLog.dump());
+ + "<2 \n" + currChangesLog.dump());
break;
}
nodeIdentifier = currChangesLog.getAllStates().get(0).getData().getParentIdentifier();
@@ -483,12 +482,12 @@
if (currChangesLog.getSize() < 2)
{
log.error("Incorrect changes log of type ExtendedEvent.UNLOCK size=" + currChangesLog.getSize()
- + "<2 \n" + currChangesLog.dump());
+ + "<2 \n" + currChangesLog.dump());
break;
}
internalUnLock(currChangesLog.getSessionId(), currChangesLog.getAllStates().get(0).getData()
- .getParentIdentifier());
+ .getParentIdentifier());
break;
default :
HashSet<String> removedLock = new HashSet<String>();
@@ -548,7 +547,7 @@
else
{
throw new LockException("Can't refresh lock for node " + newLockData.getNodeIdentifier()
- + " since lock is not exist");
+ + " since lock is not exist");
}
}
}
@@ -652,8 +651,8 @@
// make a copy, value may be null for deleting items
TransientPropertyData newData =
- new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop
- .getType(), prop.getParentIdentifier(), prop.isMultiValued(), prop.getValues());
+ new TransientPropertyData(prop.getQPath(), prop.getIdentifier(), prop.getPersistedVersion(), prop.getType(),
+ prop.getParentIdentifier(), prop.isMultiValued(), prop.getValues());
return newData;
}
@@ -689,7 +688,7 @@
*/
private LockData getLockData(NodeData data, int searchType)
{
- if (data == null || getNumLocks() == 0)
+ if (data == null)
return null;
LockData retval = null;
try
@@ -701,7 +700,7 @@
if (retval == null && (searchType & SEARCH_CLOSEDPARENT) != 0)
{
- NodeData parentData = (NodeData) dataManager.getItemData(data.getParentIdentifier());
+ NodeData parentData = (NodeData)dataManager.getItemData(data.getParentIdentifier());
if (parentData != null)
{
retval = getLockDataById(parentData.getIdentifier());
@@ -772,12 +771,12 @@
node.setResident(true);
// this will return null if success. And old data if something exists...
- LockData oldLockData = (LockData) node.putIfAbsent(LOCK_DATA, lockData);
+ LockData oldLockData = (LockData)node.putIfAbsent(LOCK_DATA, lockData);
if (oldLockData != null)
{
throw new LockException("Unable to write LockData. Node [" + lockData.getNodeIdentifier()
- + "] already has LockData!");
+ + "] already has LockData!");
}
pendingLocks.remove(nodeIdentifier);
}
@@ -864,7 +863,7 @@
Node<Serializable, Object> node = lockRoot.getChild(Fqn.fromString(nodeId));
if (node != null)
{
- lockData = (LockData) node.get(LOCK_DATA);
+ lockData = (LockData)node.get(LOCK_DATA);
}
return lockData;
}
@@ -878,7 +877,7 @@
{
if (node != null)
{
- LockData lockData = (LockData) node.get(LOCK_DATA);
+ LockData lockData = (LockData)node.get(LOCK_DATA);
if (lockData != null)
{
locksData.add(lockData);
@@ -897,19 +896,17 @@
{
try
{
- NodeData nData = (NodeData) dataManager.getItemData(nodeIdentifier);
+ NodeData nData = (NodeData)dataManager.getItemData(nodeIdentifier);
PlainChangesLog changesLog =
- new PlainChangesLogImpl(new ArrayList<ItemState>(), SystemIdentity.SYSTEM, ExtendedEvent.UNLOCK);
+ new PlainChangesLogImpl(new ArrayList<ItemState>(), SystemIdentity.SYSTEM, ExtendedEvent.UNLOCK);
ItemData lockOwner =
- copyItemData((PropertyData) dataManager
- .getItemData(nData, new QPathEntry(Constants.JCR_LOCKOWNER, 1)));
+ copyItemData((PropertyData)dataManager.getItemData(nData, new QPathEntry(Constants.JCR_LOCKOWNER, 1)));
changesLog.add(ItemState.createDeletedState(lockOwner));
ItemData lockIsDeep =
- copyItemData((PropertyData) dataManager.getItemData(nData,
- new QPathEntry(Constants.JCR_LOCKISDEEP, 1)));
+ copyItemData((PropertyData)dataManager.getItemData(nData, new QPathEntry(Constants.JCR_LOCKISDEEP, 1)));
changesLog.add(ItemState.createDeletedState(lockIsDeep));
// lock probably removed by other thread
More information about the exo-jcr-commits
mailing list