[jboss-cvs] JBossAS SVN: r97645 - in trunk/testsuite/src/main/org/jboss/test/cluster: testutil and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 9 18:06:15 EST 2009
Author: bstansberry at jboss.com
Date: 2009-12-09 18:06:14 -0500 (Wed, 09 Dec 2009)
New Revision: 97645
Modified:
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperMBean.java
Log:
Be careful about CacheHelper holding refs to caches
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java 2009-12-09 23:04:09 UTC (rev 97644)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java 2009-12-09 23:06:14 UTC (rev 97645)
@@ -266,6 +266,10 @@
if (isCleanCacheOnRedeploy())
{
+ // Make sure the cache helper isn't holding a ref to the cache,
+ // keeping it alive
+ SessionTestUtil.releaseCache(adaptors[0]);
+
// We don't expect data to survive a restart
makeGetFailed(client, baseURL0_ +getUrl);
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2009-12-09 23:04:09 UTC (rev 97644)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2009-12-09 23:06:14 UTC (rev 97645)
@@ -392,6 +392,15 @@
STRING_BOOLEAN_TYPES);
}
+ @SuppressWarnings("unchecked")
+ public static Set<String> releaseCache(MBeanServerConnection adaptor) throws Exception
+ {
+ return (Set<String>) adaptor.invoke(CacheHelper.OBJECT_NAME,
+ "releaseCache",
+ new Object[0],
+ new String[0]);
+ }
+
public static boolean isBuddyReplication() throws Exception
{
return Boolean.parseBoolean(System.getProperty("jbosstest.cluster.web.cache.br", "false"));
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java 2009-12-09 23:04:09 UTC (rev 97644)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelper.java 2009-12-09 23:06:14 UTC (rev 97645)
@@ -239,7 +239,7 @@
releaseCache();
}
- private void releaseCache()
+ public void releaseCache()
{
if (cache != null && cacheConfigName != null)
{
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperMBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperMBean.java 2009-12-09 23:04:09 UTC (rev 97644)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/CacheHelperMBean.java 2009-12-09 23:06:14 UTC (rev 97645)
@@ -38,5 +38,7 @@
Set getSSOIds() throws Exception;
boolean getCacheHasSSO(String ssoId) throws Exception;
+
+ void releaseCache();
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list