Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5FE14200CD1 for ; Wed, 12 Jul 2017 01:34:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5E18B1690F3; Tue, 11 Jul 2017 23:34:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A2FA0167933 for ; Wed, 12 Jul 2017 01:34:14 +0200 (CEST) Received: (qmail 81666 invoked by uid 500); 11 Jul 2017 23:34:13 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 81657 invoked by uid 99); 11 Jul 2017 23:34:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jul 2017 23:34:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6637E97E9; Tue, 11 Jul 2017 23:34:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 11 Jul 2017 23:34:13 -0000 Message-Id: <88e95da2fd284a198284311872b480d3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: NO-JIRA fix few typos and a docstring archived-at: Tue, 11 Jul 2017 23:34:15 -0000 Repository: activemq-artemis Updated Branches: refs/heads/master 36357e455 -> 84f830cb0 NO-JIRA fix few typos and a docstring Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3e1237c1 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3e1237c1 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3e1237c1 Branch: refs/heads/master Commit: 3e1237c1eb1c4a27acc34e3046512c8936415e40 Parents: 36357e4 Author: Jiri Danek Authored: Wed Jun 28 14:09:37 2017 +0200 Committer: Clebert Suconic Committed: Tue Jul 11 19:34:06 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/activemq/artemis/api/core/Message.java | 2 +- docs/hacking-guide/en/code.md | 2 +- .../artemis/tests/integration/client/SlowConsumerTest.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3e1237c1/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java index bef2f81..488fff0 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java @@ -70,7 +70,7 @@ import org.apache.activemq.artemis.core.persistence.Persister; */ public interface Message { - // This is an estimate of how much memory a Message takes up, exclusing body and properties + // This is an estimate of how much memory a Message takes up, excluding body and properties // Note, it is only an estimate, it's not possible to be entirely sure with Java // This figure is calculated using the test utilities in org.apache.activemq.tests.unit.util.sizeof // The value is somewhat higher on 64 bit architectures, probably due to different alignment http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3e1237c1/docs/hacking-guide/en/code.md ---------------------------------------------------------------------- diff --git a/docs/hacking-guide/en/code.md b/docs/hacking-guide/en/code.md index 8ca27f6..bb552e9 100644 --- a/docs/hacking-guide/en/code.md +++ b/docs/hacking-guide/en/code.md @@ -37,7 +37,7 @@ related JIRA or an email to the [dev list](http://activemq.apache.org/mailing-li 1. Build with Maven - Typically developers will want to build using the `dev` profile which disables license and code style checks. For + Typically developers will want to build using the `dev` profile which enables license and code style checks. For example: $ mvn -Pdev install http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3e1237c1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java index a147d39..0e43197 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java @@ -362,9 +362,9 @@ public class SlowConsumerTest extends ActiveMQTestBase { * messages at a rate of 2 messages per second. Each consumer * consumes messages at rate of 1 message per second. The slow * consumer threshold is 1 message per second. - * Based on the above settings, at least one of the consumers - * will be removed during the test, but at least one of the - * consumers will remain and all messages will be received. + * Based on the above settings, slow consumer removal will not + * be performed (2 < 3*1), so no consumer will be removed during the + * test, and all messages will be received. */ @Test public void testMultipleConsumersOneQueue() throws Exception {