[jboss-cvs] JBossAS SVN: r107981 - branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 3 10:45:00 EDT 2010
Author: pferraro
Date: 2010-09-03 10:45:00 -0400 (Fri, 03 Sep 2010)
New Revision: 107981
Modified:
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/BuddyReplicationFailoverUnitTestCase.java
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ConcurrentFailoverRequestsTestCase.java
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java
branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java
Log:
Compiler likes to crash if finally block contains an enhanced for loop with generics. Removing this usage.
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/BuddyReplicationFailoverUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/BuddyReplicationFailoverUnitTestCase.java 2010-09-03 13:55:36 UTC (rev 107980)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/BuddyReplicationFailoverUnitTestCase.java 2010-09-03 14:45:00 UTC (rev 107981)
@@ -75,18 +75,13 @@
@Override
protected void tearDown() throws Exception
{
- try
+ super.tearDown();
+
+ for (JBossCacheManager<?> manager : managers)
{
- super.tearDown();
- }
- finally
- {
- for (JBossCacheManager<?> manager : managers)
+ if (manager != null)
{
- if (manager != null)
- {
- manager.stop();
- }
+ manager.stop();
}
}
}
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ConcurrentFailoverRequestsTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ConcurrentFailoverRequestsTestCase.java 2010-09-03 13:55:36 UTC (rev 107980)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ConcurrentFailoverRequestsTestCase.java 2010-09-03 14:45:00 UTC (rev 107981)
@@ -86,47 +86,42 @@
@Override
protected void tearDown() throws Exception
{
- try
+ super.tearDown();
+
+ jgSupport.restoreProperties();
+
+ if (threadPool != null)
{
- super.tearDown();
+ threadPool.shutdownNow();
}
- finally
- {
- jgSupport.restoreProperties();
-
- if (threadPool != null)
- {
- threadPool.shutdownNow();
- }
- for (JBossCacheManager<?> manager: managers)
+ for (JBossCacheManager<?> manager: managers)
+ {
+ if (manager != null)
{
- if (manager != null)
+ try
{
- try
- {
- manager.stop();
- }
- catch (Exception e)
- {
- log.error(e.getMessage(), e);
- }
+ manager.stop();
}
+ catch (Exception e)
+ {
+ log.error(e.getMessage(), e);
+ }
}
-
- for (CacheContainer cacheContainer: cacheContainers)
+ }
+
+ for (CacheContainer cacheContainer: cacheContainers)
+ {
+ if (cacheContainer != null)
{
- if (cacheContainer != null)
+ try
{
- try
- {
- cacheContainer.stop();
- }
- catch (Exception e)
- {
- log.error(e.getMessage(), e);
- }
+ cacheContainer.stop();
}
+ catch (Exception e)
+ {
+ log.error(e.getMessage(), e);
+ }
}
}
}
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java 2010-09-03 13:55:36 UTC (rev 107980)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/ReplicationToPassivatedSessionUnitTestCase.java 2010-09-03 14:45:00 UTC (rev 107981)
@@ -68,18 +68,13 @@
@Override
protected void tearDown() throws Exception
{
- try
+ super.tearDown();
+
+ for (JBossCacheManager<?> manager : managers)
{
- super.tearDown();
- }
- finally
- {
- for (JBossCacheManager<?> manager : managers)
+ if (manager != null)
{
- if (manager != null)
- {
- manager.stop();
- }
+ manager.stop();
}
}
}
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java 2010-09-03 13:55:36 UTC (rev 107980)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java 2010-09-03 14:45:00 UTC (rev 107981)
@@ -81,44 +81,39 @@
@Override
protected void tearDown() throws Exception
{
+ super.tearDown();
+
try
{
- super.tearDown();
- }
- finally
- {
- try
+ // Restore any system properties we set in setUp
+ if (jgroupsSupport != null)
{
- // Restore any system properties we set in setUp
- if (jgroupsSupport != null)
+ jgroupsSupport.restoreProperties();
+ }
+
+ for (JBossCacheManager<?> manager: managers)
+ {
+ if (manager != null)
{
- jgroupsSupport.restoreProperties();
+ manager.stop();
}
-
- for (JBossCacheManager<?> manager: managers)
- {
- if (manager != null)
- {
- manager.stop();
- }
- }
-
- for (CacheContainer cacheContainer: cacheContainers)
- {
- if (cacheContainer != null)
- {
- cacheContainer.stop();
- }
- }
}
- finally
- {
- if (tempDir != null)
+
+ for (CacheContainer cacheContainer: cacheContainers)
+ {
+ if (cacheContainer != null)
{
- SessionTestUtil.cleanFilesystem(tempDir);
+ cacheContainer.stop();
}
}
}
+ finally
+ {
+ if (tempDir != null)
+ {
+ SessionTestUtil.cleanFilesystem(tempDir);
+ }
+ }
}
public void testStandaloneMaxSessions() throws Exception
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java 2010-09-03 13:55:36 UTC (rev 107980)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java 2010-09-03 14:45:00 UTC (rev 107981)
@@ -71,33 +71,28 @@
protected void tearDown() throws Exception
{
- try
+ super.tearDown();
+
+ // Restore any system properties we set in setUp
+ if (jgroupsSupport != null)
{
- super.tearDown();
+ jgroupsSupport.restoreProperties();
}
- finally
- {
- // Restore any system properties we set in setUp
- if (jgroupsSupport != null)
+
+ for (JBossCacheManager<?> manager: managers)
+ {
+ if (manager != null)
{
- jgroupsSupport.restoreProperties();
+ manager.stop();
}
-
- for (JBossCacheManager<?> manager: managers)
+ }
+
+ for (CacheContainer cacheContainer: cacheContainers)
+ {
+ if (cacheContainer != null)
{
- if (manager != null)
- {
- manager.stop();
- }
+ cacheContainer.stop();
}
-
- for (CacheContainer cacheContainer: cacheContainers)
- {
- if (cacheContainer != null)
- {
- cacheContainer.stop();
- }
- }
}
}
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java 2010-09-03 13:55:36 UTC (rev 107980)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java 2010-09-03 14:45:00 UTC (rev 107981)
@@ -61,21 +61,16 @@
@Override
protected void tearDown() throws Exception
{
- try
+ super.tearDown();
+
+ if (manager != null)
{
- super.tearDown();
+ manager.stop();
}
- finally
- {
- if (manager != null)
- {
- manager.stop();
- }
-
- if (cacheContainer != null)
- {
- cacheContainer.stop();
- }
+
+ if (cacheContainer != null)
+ {
+ cacheContainer.stop();
}
}
More information about the jboss-cvs-commits
mailing list