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 2021/07/13 12:29:53 UTC
[activemq-artemis] branch main updated (b4d4ea3 -> 18e9dee)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from b4d4ea3 This closes #3650
new fb5f6a3 NO-JIRA I got tired of the ThreadDump after Wait failures. I am removing it.
new 18e9dee NO-JIRA Small tweaks on AMQPMessage. - adding annotations into toString() - comment typo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/test/java/org/apache/activemq/artemis/utils/Wait.java | 3 ---
.../org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java | 3 ++-
2 files changed, 2 insertions(+), 4 deletions(-)
[activemq-artemis] 01/02: NO-JIRA I got tired of the ThreadDump
after Wait failures. I am removing it.
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit fb5f6a3f826f1349bd290bfc97235fdbf7a9d439
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Fri Jul 9 16:06:26 2021 -0400
NO-JIRA I got tired of the ThreadDump after Wait failures. I am removing it.
---
.../src/test/java/org/apache/activemq/artemis/utils/Wait.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/Wait.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/Wait.java
index 62c8c2d..50596e6 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/Wait.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/Wait.java
@@ -94,7 +94,6 @@ public class Wait {
boolean result = waitFor(() -> (obj == condition || obj.equals(condition.getObject())), timeout, sleepMillis);
if (!result) {
- System.out.println(ThreadDumpUtil.threadDump("thread dump"));
Assert.assertEquals(obj, condition.getObject());
}
}
@@ -103,7 +102,6 @@ public class Wait {
boolean result = waitFor(() -> condition.getCount() == size, timeout, sleepMillis);
if (!result) {
- System.out.println(ThreadDumpUtil.threadDump("thread dump"));
Assert.fail(size + " != " + condition.getCount());
}
}
@@ -150,7 +148,6 @@ public class Wait {
boolean result = waitFor(condition, duration, sleep);
if (!result) {
- System.out.println(ThreadDumpUtil.threadDump("thread dump"));
Assert.fail(failureMessage);
}
}
[activemq-artemis] 02/02: NO-JIRA Small tweaks on AMQPMessage. -
adding annotations into toString() - comment typo
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 18e9dee490007445ff8ec12899b6c66c678bcc6d
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue Jul 13 08:28:03 2021 -0400
NO-JIRA Small tweaks on AMQPMessage.
- adding annotations into toString()
- comment typo
---
.../org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 18608d9..3ad1e46 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -1073,7 +1073,7 @@ public abstract class AMQPMessage extends RefCountMessage implements org.apache.
if (header != null && header .getDurable() != null) {
return header.getDurable();
} else {
- // if header == null and scanninStatus=RELOAD_PERSISTENCE, it means the message can only be durable
+ // if header == null and scanningStatus=RELOAD_PERSISTENCE, it means the message can only be durable
// even though the parsing hasn't happened yet
return getDataScanningStatus() == MessageDataScanningStatus.RELOAD_PERSISTENCE;
}
@@ -1706,6 +1706,7 @@ public abstract class AMQPMessage extends RefCountMessage implements org.apache.
", address=" + getAddress() +
", size=" + getEncodeSize() +
", applicationProperties=" + getApplicationPropertiesMap(false) +
+ ", messageAnnotations=" + getMessageAnnotationsMap(false) +
", properties=" + properties +
", extraProperties = " + getExtraProperties() +
"]";