[jboss-cvs] JBossAS SVN: r101649 - in projects/ejb3/trunk/core/src: test/java/org/jboss/ejb3/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 1 03:22:18 EST 2010
Author: jaikiran
Date: 2010-03-01 03:22:17 -0500 (Mon, 01 Mar 2010)
New Revision: 101649
Added:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/Counter.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/SimpleSFSB.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/unit/
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/unit/SimpleStatefulCacheTestCase.java
Modified:
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
Log:
EJBTHREE-2030 Fixed the remove() method of SimpleStatefulCache to check for passivated sessions before throwing NoSuchEJBException
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java 2010-03-01 08:18:06 UTC (rev 101648)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java 2010-03-01 08:22:17 UTC (rev 101649)
@@ -535,11 +535,11 @@
{
log.trace("Removing context " + key);
}
- StatefulBeanContext ctx = null;
- synchronized (cacheMap)
- {
- ctx = cacheMap.get(key);
- }
+ // don't directly use the cacheMap to get the
+ // object from the key. Instead, use the get() method
+ // which will even activate any sessions which have been
+ // passivated (see https://jira.jboss.org/jira/browse/EJBTHREE-2030)
+ StatefulBeanContext ctx = this.get(key);
if(ctx == null)
throw new NoSuchEJBException("Could not find Stateful bean: " + key);
if (!ctx.isRemoved())
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/Counter.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/Counter.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/Counter.java 2010-03-01 08:22:17 UTC (rev 101649)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* 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.ejb3.test.ejbthree2030;
+
+/**
+ * Counter
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public interface Counter
+{
+ void incrementCount();
+
+ int getCount();
+}
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/SimpleSFSB.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/SimpleSFSB.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/SimpleSFSB.java 2010-03-01 08:22:17 UTC (rev 101649)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* 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.ejb3.test.ejbthree2030;
+
+import javax.ejb.Remote;
+import javax.ejb.Stateful;
+
+import org.jboss.ejb3.annotation.CacheConfig;
+
+/**
+ * SimpleSFSB
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+ at Stateful
+ at Remote(Counter.class)
+// set idletimeout to 3 seconds to allow passivation to happen after 3 seconds of inactivity
+ at CacheConfig(idleTimeoutSeconds = 3)
+public class SimpleSFSB implements Counter
+{
+
+ private int count;
+
+ /**
+ * @see org.jboss.ejb3.test.ejbthree2030.Counter#getCount()
+ */
+ public int getCount()
+ {
+ return this.count;
+ }
+
+ /**
+ * @see org.jboss.ejb3.test.ejbthree2030.Counter#incrementCount()
+ */
+ public void incrementCount()
+ {
+ this.count++;
+
+ }
+
+}
Added: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/unit/SimpleStatefulCacheTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/unit/SimpleStatefulCacheTestCase.java (rev 0)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/ejbthree2030/unit/SimpleStatefulCacheTestCase.java 2010-03-01 08:22:17 UTC (rev 101649)
@@ -0,0 +1,144 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* 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.ejb3.test.ejbthree2030.unit;
+
+import javax.ejb.NoSuchEJBException;
+
+import org.jboss.ejb3.cache.simple.SimpleStatefulCache;
+import org.jboss.ejb3.core.test.common.AbstractEJB3TestCase;
+import org.jboss.ejb3.session.SessionContainer;
+import org.jboss.ejb3.stateful.StatefulBeanContext;
+import org.jboss.ejb3.test.ejbthree2030.SimpleSFSB;
+import org.jboss.logging.Logger;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * SimpleStatefulCacheTest
+ *
+ * Tests the {@link SimpleStatefulCache}
+ * <p>
+ * More specifically, tests the fix for https://jira.jboss.org/jira/browse/EJBTHREE-2030, where
+ * a remove() on the cache was *not* checking for passivated sessions.
+ * </p>
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class SimpleStatefulCacheTestCase extends AbstractEJB3TestCase
+{
+
+ /**
+ * Logger
+ */
+ private static Logger logger = Logger.getLogger(SimpleStatefulCacheTestCase.class);
+
+ /**
+ * Container for {@link SimpleSFSB}
+ */
+ private static SessionContainer container;
+
+ /**
+ * A {@link SimpleStatefulCache} for the {@link #container}
+ */
+ private static SimpleStatefulCache cache;
+
+ /**
+ * Deploy the bean, create the container and init/start the cache
+ * @throws Exception
+ */
+ @BeforeClass
+ public static void beforeClass() throws Exception
+ {
+ AbstractEJB3TestCase.beforeClass();
+
+ // Deploy the test SLSB
+ container = deploySessionEjb(SimpleSFSB.class);
+
+ cache = new SimpleStatefulCache();
+ cache.initialize(container);
+ cache.start();
+ }
+
+ /**
+ * Cleanup
+ * @throws Exception
+ */
+ @AfterClass
+ public static void afterClass() throws Exception
+ {
+ cache.stop();
+
+ // Undeploy the test SLSB
+ undeployEjb(container);
+
+ AbstractEJB3TestCase.afterClass();
+
+ }
+
+ /**
+ * Tests that when a {@link StatefulBeanContext} is passivated and later a remove() for that
+ * context is invoked, the {@link SimpleStatefulCache} first activates the session and then
+ * successfully removes it
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testRemovalAfterPassivation() throws Exception
+ {
+ // create a session
+ StatefulBeanContext sfsbContext = cache.create();
+ Object sessionId = sfsbContext.getId();
+ logger.info("Created StatefulBeanContext with session id " + sessionId);
+ // mark it as *not in use* so that it can be passivated
+ sfsbContext.setInUse(false);
+ // wait for 3 (or more seconds for passivation to happen)
+ // The SimpleSFSB is configured for a idleTimeout of 3 seconds (so that it will be
+ // passivated after 3 seconds of inactivity)
+ logger.info("Sleeping for 6 seconds to allow passivation thread to passivate the bean context with id "
+ + sessionId);
+ Thread.sleep(6000);
+ logger.info("Woke up - trying to remove session " + sessionId + " from cache");
+ cache.remove(sessionId);
+ logger.info("Successfully removed " + sessionId + " from cache");
+ }
+
+ /**
+ * Tests that removal of a non-existent key from {@link SimpleStatefulCache} throws
+ * a {@link NoSuchEJBException}
+ * @throws Exception
+ */
+ @Test
+ public void testRemovalOfNonExistentEntry() throws Exception
+ {
+ try
+ {
+ cache.remove("NonExistentKey");
+ Assert.fail(SimpleStatefulCache.class.getSimpleName() + " allowed removal of a non-existent key in cache");
+ }
+ catch (NoSuchEJBException nsee)
+ {
+ // expected
+ }
+ }
+}
More information about the jboss-cvs-commits
mailing list