From 1b245e3abac8908522f478aab6ab0aa19bb6b668 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 6 Jul 2012 20:08:36 +0000 Subject: QPID-4113: no longer caching duration override because it broke inter-test isolation. Applied patch from Philip Harvey git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1358395 13f79535-47bb-0310-9956-ffa450edef68 --- .../disttest/controller/config/ParticipantConfig.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java index 5ebd73a8b9..16f7b0d18d 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java @@ -29,8 +29,8 @@ public abstract class ParticipantConfig public static final String DURATION_OVERRIDE_SYSTEM_PROPERTY = "qpid.disttest.duration"; - /** we cache the overridden duration so that we only compute and - more importantly - log it once */ - private static Long cachedOverriddenDuration; + /** used to ensure we only log about the overridden duration once */ + private boolean _alreadyLoggedAboutOverriddenDuration; private String _destinationName; private long _numberOfMessages; @@ -75,19 +75,19 @@ public abstract class ParticipantConfig private Long getOverriddenDuration() { - if(cachedOverriddenDuration != null) - { - return cachedOverriddenDuration; - } - String overriddenDurationString = System.getProperty(DURATION_OVERRIDE_SYSTEM_PROPERTY); if(overriddenDurationString != null) { try { long overriddenDuration = Long.valueOf(overriddenDurationString); - LOGGER.info("Applied overridden maximum duration " + overriddenDuration); - cachedOverriddenDuration = overriddenDuration; + + if(!_alreadyLoggedAboutOverriddenDuration) + { + LOGGER.info("Applied overridden maximum duration " + overriddenDuration); + _alreadyLoggedAboutOverriddenDuration = true; + } + return overriddenDuration; } catch (NumberFormatException e) -- cgit v1.2.1