Repository: activemq-artemis Updated Branches: refs/heads/master 0c081c68c -> 515560be2 (forced update)
NO-JIRA Fixing SystemPropertyOverrideTest Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/515560be Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/515560be Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/515560be Branch: refs/heads/master Commit: 515560be2a5dbd8086c177784cdfbd458bbb0596 Parents: 2dda27e Author: Clebert Suconic <[email protected]> Authored: Thu Dec 21 03:27:24 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Thu Dec 21 07:22:51 2017 -0500 ---------------------------------------------------------------------- .../core/server/group/impl/GroupingHandlerConfiguration.java | 7 +++++++ .../core/server/group/impl/SystemPropertyOverrideTest.java | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/515560be/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java index 4ee8269..5b38455 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/GroupingHandlerConfiguration.java @@ -45,6 +45,13 @@ public final class GroupingHandlerConfiguration implements Serializable { private long reaperPeriod = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(); public GroupingHandlerConfiguration() { + if (System.getProperty(GROUP_TIMEOUT_PROP_NAME) != null) { + this.groupTimeout = Long.parseLong(System.getProperty(GROUP_TIMEOUT_PROP_NAME)); + } + + if (System.getProperty(REAPER_PERIOD_PROP_NAME) != null) { + this.reaperPeriod = Long.parseLong(System.getProperty(REAPER_PERIOD_PROP_NAME)); + } } public SimpleString getName() { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/515560be/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java index 1211897..0e22146 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/group/impl/SystemPropertyOverrideTest.java @@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.unit.core.server.group.impl; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -import org.junit.Ignore; import org.junit.Test; public class SystemPropertyOverrideTest extends ActiveMQTestBase { @@ -34,7 +33,6 @@ public class SystemPropertyOverrideTest extends ActiveMQTestBase { // Public -------------------------------------------------------- @Test - @Ignore public void testSystemPropertyOverride() throws Exception { final String groupTimeoutPropertyValue = "1234"; final String reaperPeriodPropertyValue = "5678";
