Author: tolusha Date: 2009-11-12 03:18:35 -0500 (Thu, 12 Nov 2009) New Revision: 577 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java Log: EXOJCR-201: bug fix Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java 2009-11-12 08:07:37 UTC (rev 576) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java 2009-11-12 08:18:35 UTC (rev 577) @@ -22,12 +22,10 @@ import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; -import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.jboss.cache.CacheException; -import org.jboss.cache.Fqn; import org.jboss.cache.Modification; import org.jboss.cache.Modification.ModificationType; import org.jboss.cache.factories.annotations.Inject; @@ -247,7 +245,7 @@ { if (lockManager.hasPendingLocks(nodeIdentifier)) { - System.out.println("Perform lock operation nodeIdentifier=" + nodeIdentifier); + log.info("Perform lock operation nodeIdentifier=" + nodeIdentifier); lockManager.internalLock(nodeIdentifier); } else @@ -297,7 +295,7 @@ { try { - System.out.println("Perform unlock operation nodeIdentifier=" + nodeIdentifier + " sessionId=" + sessionId); + log.info("Perform unlock operation nodeIdentifier=" + nodeIdentifier + " sessionId=" + sessionId); lockManager.internalUnLock(nodeIdentifier, sessionId); } catch (LockException e) Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java 2009-11-12 08:07:37 UTC (rev 576) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java 2009-11-12 08:18:35 UTC (rev 577) @@ -61,7 +61,7 @@ * @see junit.framework.TestCase#setUp() */ @Override - protected void setUp() throws Exception + public void setUp() throws Exception { // TODO Auto-generated method stub super.setUp(); Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-12 08:07:37 UTC (rev 576) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-12 08:18:35 UTC (rev 577) @@ -80,7 +80,7 @@ private LocationFactory lf; @Override - protected void setUp() throws Exception + public void setUp() throws Exception { super.setUp(); loader = new ObservationCacheLoader(); @@ -551,6 +551,10 @@ { } + public void addSessionInfo(String sessionId) throws RepositoryException + { + } + } }