You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2018/10/10 16:29:03 UTC
[1/2] activemq-artemis git commit: ARTEMIS-2096 Fixing
DivertTopicToQueueTest
Repository: activemq-artemis
Updated Branches:
refs/heads/master ae738c426 -> f5a73dfab
ARTEMIS-2096 Fixing DivertTopicToQueueTest
This is fixing the test org.apache.activemq.artemis.tests.integration.amqp.DivertTopicToQueueTest
This test was broken because the copy wouldn't use the Buffer view gotten by data.duplicate().
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/48b55632
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/48b55632
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/48b55632
Branch: refs/heads/master
Commit: 48b5563241a28563a72d83431790b2f6b45b1582
Parents: ae738c4
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Oct 10 12:09:40 2018 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 10 12:27:45 2018 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/48b55632/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
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 821356a..c7f1b50 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
@@ -497,7 +497,7 @@ public class AMQPMessage extends RefCountMessage {
// Copy the full message contents with delivery annotations as they will
// be trimmed on send and may become useful on the broker at a later time.
- data.get(newData);
+ view.get(newData);
AMQPMessage newEncode = new AMQPMessage(this.messageFormat, newData, extraProperties, coreMessageObjectPools);
newEncode.setMessageID(this.getMessageID());
[2/2] activemq-artemis git commit: This closes #2361
Posted by ta...@apache.org.
This closes #2361
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f5a73dfa
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f5a73dfa
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f5a73dfa
Branch: refs/heads/master
Commit: f5a73dfab1754105134425f017d6c5859e38be17
Parents: ae738c4 48b5563
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Oct 10 12:28:42 2018 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 10 12:28:42 2018 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------