Author: robbie Date: Fri Jul 6 20:08:36 2012 New Revision: 1358395 URL: http://svn.apache.org/viewvc?rev=1358395&view=rev Log: QPID-4113: no longer caching duration override because it broke inter-test isolation.
Applied patch from Philip Harvey <[email protected]> Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java?rev=1358395&r1=1358394&r2=1358395&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java (original) +++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java Fri Jul 6 20:08:36 2012 @@ -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) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
