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 2016/09/09 13:50:24 UTC
[1/2] activemq-artemis git commit: This closes #764
Repository: activemq-artemis
Updated Branches:
refs/heads/master a18ad2784 -> 2ef20e615
This closes #764
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2ef20e61
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2ef20e61
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2ef20e61
Branch: refs/heads/master
Commit: 2ef20e6152ff5129a1df96afe7a2eb3587bbf0c2
Parents: a18ad27 8c7599d
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Sep 9 09:49:38 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 9 09:49:38 2016 -0400
----------------------------------------------------------------------
.../core/protocol/proton/converter/jms/ServerJMSMessage.java | 3 ++-
.../proton/converter/message/JMSMappingOutboundTransformer.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-725 Strip internal headers
on AMQP Out
Posted by cl...@apache.org.
ARTEMIS-725 Strip internal headers on AMQP Out
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8c7599d5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8c7599d5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8c7599d5
Branch: refs/heads/master
Commit: 8c7599d5e4c24c178f1ace653b98926ca1d0497e
Parents: a18ad27
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Sep 9 11:42:29 2016 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Sep 9 09:49:38 2016 -0400
----------------------------------------------------------------------
.../core/protocol/proton/converter/jms/ServerJMSMessage.java | 3 ++-
.../proton/converter/message/JMSMappingOutboundTransformer.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c7599d5/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
index 0d82236..465539b 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
@@ -32,8 +32,9 @@ import org.apache.activemq.artemis.reader.MessageUtil;
public class ServerJMSMessage implements Message {
+ public static final String NATIVE_MESSAGE_ID = "NATIVE_MESSAGE_ID";
+
protected final MessageInternal message;
- private final String NATIVE_MESSAGE_ID = "NATIVE_MESSAGE_ID";
protected int deliveryCount;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c7599d5/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
index f803cfa..1f202f6 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java
@@ -17,6 +17,7 @@
package org.apache.activemq.artemis.core.protocol.proton.converter.message;
import org.apache.activemq.artemis.core.message.impl.MessageInternal;
+import org.apache.activemq.artemis.core.protocol.proton.converter.jms.ServerJMSMessage;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.amqp.UnsignedByte;
@@ -223,7 +224,7 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
final Enumeration<String> keys = msg.getPropertyNames();
while (keys.hasMoreElements()) {
String key = keys.nextElement();
- if (key.equals(messageFormatKey) || key.equals(nativeKey)) {
+ if (key.equals(messageFormatKey) || key.equals(nativeKey) || key.equals(ServerJMSMessage.NATIVE_MESSAGE_ID)) {
// skip..
}
else if (key.equals(firstAcquirerKey)) {