diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-10-06 20:04:48 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-10-06 20:04:48 +0000 |
| commit | c6a7ee5f8f6734cd575a06221c91482bda051338 (patch) | |
| tree | 1fa7900da893ecadddbb89540d90bd5f8c141dab /qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java | |
| parent | c990cf362892d56923bda018a61e4dd4b236bb55 (diff) | |
| download | qpid-python-c6a7ee5f8f6734cd575a06221c91482bda051338.tar.gz | |
QPID-3346: merge **from** trunk **to** qpid-3346 dev branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3346@1179802 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java index a2487b49bf..aef98b8a2a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java @@ -136,7 +136,7 @@ public class AlertingTest extends AbstractTestLogging stopBroker(); // Rest the monitoring clearing the current output file. - _monitor.reset(); + _monitor.markDiscardPoint(); startBroker(); wasAlertFired(); } @@ -169,7 +169,7 @@ public class AlertingTest extends AbstractTestLogging stopBroker(); - _monitor.reset(); + _monitor.markDiscardPoint(); // Change max message count to 5, start broker and make sure that that's triggered at the right time setConfigurationProperty("virtualhosts.virtualhost." + VIRTUALHOST + ".queues.maximumMessageCount", "5"); |