summaryrefslogtreecommitdiff
path: root/java/systests/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-06-19 14:53:29 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-06-19 14:53:29 +0000
commit89238b6c323ec9d5164fe630ac66b4b5ab2cfdcd (patch)
tree61dd0bb31bb872563e89466ed01daccd85a2a892 /java/systests/src
parentd43e1a5351598e558d01de9493c21870b3b0bcbb (diff)
downloadqpid-python-89238b6c323ec9d5164fe630ac66b4b5ab2cfdcd.tar.gz
Fixed outstanding merge issues and updates to trunk code that were required for sl4j.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@548753 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/systests/src')
-rw-r--r--java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java b/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
index f89dc73bc6..012a983be5 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
@@ -82,7 +82,7 @@ public class HeapExhaustion extends TestCase
*
* @throws Exception on error
*/
- public void testUntilFailure() throws Exception
+ public void testUntilFailureTransient() throws Exception
{
int copies = 0;
int total = 0;
@@ -102,7 +102,7 @@ public class HeapExhaustion extends TestCase
*
* @throws Exception on error
*/
- public void testUntilFailureWithDelays() throws Exception
+ public void testUntilFailureWithDelaysTransient() throws Exception
{
int copies = 0;
int total = 0;
@@ -137,7 +137,7 @@ public class HeapExhaustion extends TestCase
_logger.info("Running testUntilFailure");
try
{
- he.testUntilFailure();
+ he.testUntilFailureTransient();
}
catch (FailoverException fe)
{
@@ -186,7 +186,7 @@ public class HeapExhaustion extends TestCase
_logger.info("Running testUntilFailure");
try
{
- he.testUntilFailureWithDelays();
+ he.testUntilFailureWithDelaysTransient();
}
catch (FailoverException fe)
{