Author: manik.surtani(a)jboss.com Date: 2008-10-03 06:10:45 -0400 (Fri, 03 Oct 2008) New Revision: 6830 Added: core/branches/2.2.X/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/DataContainerImpl.java Log: JBCACHE-1420 - LockForChildInsertRemove flag not set for root node Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/DataContainerImpl.java =================================================================== --- core/branches/2.2.X/src/main/java/org/jboss/cache/DataContainerImpl.java 2008-10-02 14:42:40 UTC (rev 6829) +++ core/branches/2.2.X/src/main/java/org/jboss/cache/DataContainerImpl.java 2008-10-03 10:10:45 UTC (rev 6830) @@ -87,6 +87,7 @@ setRoot(tempRoot); } root.setChildrenLoaded(true); + root.setLockForChildInsertRemove(configuration.isLockParentForChildInsertRemove()); } @Stop(priority = 100) Added: core/branches/2.2.X/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java =================================================================== --- core/branches/2.2.X/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java (rev 0) +++ core/branches/2.2.X/src/test/java/org/jboss/cache/lock/LockParentRootFlagTest.java 2008-10-03 10:10:45 UTC (rev 6830) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.cache.lock; + +import org.jboss.cache.Cache; +import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.config.Configuration.NodeLockingScheme; +import org.jboss.cache.util.TestingUtil; +import org.testng.annotations.Test; + +@Test(groups = "functional") +public class LockParentRootFlagTest +{ + // to test https://jira.jboss.org/jira/browse/JBCACHE-1420 + + public void testPessimisticSet() + { + doTest(NodeLockingScheme.PESSIMISTIC, true); + } + + public void testPessimisticUnset() + { + doTest(NodeLockingScheme.PESSIMISTIC, false); + } + + public void testOptimisticSet() + { + doTest(NodeLockingScheme.OPTIMISTIC, true); + } + + public void testOptimisticUnset() + { + doTest(NodeLockingScheme.OPTIMISTIC, false); + } + + + private void doTest(NodeLockingScheme nls, boolean set) + { + Cache c = null; + try + { + c = new DefaultCacheFactory().createCache(false); + c.getConfiguration().setNodeLockingScheme(nls); + c.getConfiguration().setLockParentForChildInsertRemove(set); + c.start(); + assert c.getRoot().isLockForChildInsertRemove() == set; + } + finally + { + TestingUtil.killCaches(c); + } + } +}