Author: nzamosenchuk Date: 2009-11-19 06:07:57 -0500 (Thu, 19 Nov 2009) New Revision: 765 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java Log: EXOJCR-243: Check list not null Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java 2009-11-19 10:56:39 UTC (rev 764) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java 2009-11-19 11:07:57 UTC (rev 765) @@ -404,21 +404,24 @@ return; } // list acquired, traversing to cleanup locks; - for (LockData lockData : lockDatas) + if (lockDatas != null) { - if (lockData.isSessionScoped() && isLockHolder(lockData)) + for (LockData lockData : lockDatas) { - NodeData node; - // if can't unlock this, still try to unlock the next one - try + if (lockData.isSessionScoped() && isLockHolder(lockData)) { - node = (NodeData)sessionDataManager.getItemData(lockData.getNodeIdentifier()); - unlock(node); + NodeData node; + // if can't unlock this, still try to unlock the next one + try + { + node = (NodeData)sessionDataManager.getItemData(lockData.getNodeIdentifier()); + unlock(node); + } + catch (RepositoryException e) + { + log.error("Can't unlock node on session logout, id:" + lockData.getNodeIdentifier(), e); + } } - catch (RepositoryException e) - { - log.error("Can't unlock node on session logout, id:" + lockData.getNodeIdentifier(), e); - } } } }