Repository: incubator-rocketmq Updated Branches: refs/heads/master 23e6c7ae5 -> 0c0b730b2
Fix integer overflow. Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/0c0b730b Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/0c0b730b Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/0c0b730b Branch: refs/heads/master Commit: 0c0b730b258b84d2e1affb10ecf6a0ee7cae2f4a Parents: 23e6c7a Author: Zhanhui Li <[email protected]> Authored: Thu Jan 5 11:59:11 2017 +0800 Committer: Zhanhui Li <[email protected]> Committed: Thu Jan 5 11:59:11 2017 +0800 ---------------------------------------------------------------------- .../apache/rocketmq/common/BrokerConfig.java | 2 +- .../rocketmq/common/BrokerConfigTest.java | 30 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/0c0b730b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java index 6ddb9e1..f79f726 100644 --- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java +++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java @@ -91,7 +91,7 @@ public class BrokerConfig { private boolean slaveReadEnable = false; private boolean disableConsumeIfConsumerReadSlowly = false; - private long consumerFallbehindThreshold = 1024 * 1024 * 1024 * 16; + private long consumerFallbehindThreshold = 1024L * 1024 * 1024 * 16; private long waitTimeMillsInSendQueue = 200; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/0c0b730b/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java b/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java new file mode 100644 index 0000000..c8cdaaf --- /dev/null +++ b/common/src/test/java/org/apache/rocketmq/common/BrokerConfigTest.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.rocketmq.common; + +import org.junit.Assert; +import org.junit.Test; + +public class BrokerConfigTest { + + @Test + public void testConsumerFallBehindThresholdOverflow() { + long expect = 1024L * 1024 * 1024 * 16; + Assert.assertEquals(expect, new BrokerConfig().getConsumerFallbehindThreshold()); + } + +} \ No newline at end of file
