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/08 13:31:51 UTC
[1/2] activemq-artemis git commit: ARTEMIS-720 Add JMSX properties in
AMQP<->JMS converter
Repository: activemq-artemis
Updated Branches:
refs/heads/master a7cac9ba5 -> bbb962045
ARTEMIS-720 Add JMSX properties in AMQP<->JMS converter
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/db7dfba6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/db7dfba6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/db7dfba6
Branch: refs/heads/master
Commit: db7dfba6079c2f46bed5965b85510c7fcc91bd2e
Parents: a7cac9b
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Sep 8 11:56:38 2016 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Sep 8 09:31:43 2016 -0400
----------------------------------------------------------------------
.../proton/converter/ActiveMQJMSVendor.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/db7dfba6/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
index 3cfb0a5..9265abe 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
@@ -18,6 +18,7 @@ package org.apache.activemq.artemis.core.protocol.proton.converter;
import javax.jms.BytesMessage;
import javax.jms.Destination;
+import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.ObjectMessage;
@@ -90,19 +91,29 @@ public class ActiveMQJMSVendor implements JMSVendor {
try {
message.setStringProperty("_AMQ_GROUP_ID", s);
}
- catch (Exception e) {
- e.printStackTrace();
-
+ catch (JMSException e) {
+ throw new RuntimeException(e);
}
}
@Override
public void setJMSXGroupSequence(Message message, int i) {
-
+ try {
+ message.setIntProperty("JMSXGroupSeq", i);
+ }
+ catch (JMSException e) {
+ throw new RuntimeException(e);
+ }
}
@Override
public void setJMSXDeliveryCount(Message message, long l) {
+ try {
+ message.setLongProperty("JMSXDeliveryCount", l);
+ }
+ catch (JMSException e) {
+ throw new RuntimeException(e);
+ }
}
public ServerJMSMessage wrapMessage(int messageType, ServerMessage wrapped, int deliveryCount) {
[2/2] activemq-artemis git commit: This closes #761
Posted by cl...@apache.org.
This closes #761
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bbb96204
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bbb96204
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bbb96204
Branch: refs/heads/master
Commit: bbb962045e59ba7851a8b2b23241dd5f3ac498bd
Parents: a7cac9b db7dfba
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 8 09:31:44 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Sep 8 09:31:44 2016 -0400
----------------------------------------------------------------------
.../proton/converter/ActiveMQJMSVendor.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------