You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/07/11 23:34:13 UTC
[1/2] activemq-artemis git commit: NO-JIRA fix few typos and a
docstring
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 <jd...@redhat.com>
Authored: Wed Jun 28 14:09:37 2017 +0200
Committer: Clebert Suconic <cl...@apache.org>
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 {
[2/2] activemq-artemis git commit: This closes #1392
Posted by cl...@apache.org.
This closes #1392
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/84f830cb
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/84f830cb
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/84f830cb
Branch: refs/heads/master
Commit: 84f830cb0ccc0b2d8bb411d6470e989b2591ee5a
Parents: 36357e4 3e1237c
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 11 19:34:07 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 11 19:34:07 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(-)
----------------------------------------------------------------------