Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-5684 

Whem possible restore the orignal MessageId value from the incoming
message.
This commit is contained in:
Timothy Bish 2015-03-27 18:59:34 -04:00
parent efc9a8d578
commit af13292916
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
View File

@ -39,6 +39,8 @@ import javax.jms.TemporaryTopic;
import javax.jms.TextMessage;
import javax.jms.Topic;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.MessageId;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.amqp.UnsignedByte;
@ -174,7 +176,14 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
props.setSubject(msg.getJMSType());
}
if (msg.getJMSMessageID() != null) {
props.setMessageId(msg.getJMSMessageID());
ActiveMQMessage amqMsg = (ActiveMQMessage) msg;
MessageId msgId = amqMsg.getMessageId();
if (msgId.getTextView() != null) {
props.setMessageId(msgId.getTextView());
} else {
props.setMessageId(msgId.toString());
}
}
if (msg.getJMSDestination() != null) {
props.setTo(vendor.toAddress(msg.getJMSDestination()));

4
activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpSendReceiveTest.java
View File

@ -28,7 +28,6 @@ import org.apache.activemq.transport.amqp.client.AmqpMessage;
import org.apache.activemq.transport.amqp.client.AmqpReceiver;
import org.apache.activemq.transport.amqp.client.AmqpSender;
import org.apache.activemq.transport.amqp.client.AmqpSession;
import org.junit.Ignore;
import org.junit.Test;
/**
@ -36,7 +35,6 @@ import org.junit.Test;
*/
public class AmqpSendReceiveTest extends AmqpClientTestSupport {
@Ignore("Test fails when JMS transformer is in play")
@Test(timeout = 60000)
public void testCloseBusyReceiver() throws Exception {
final int MSG_COUNT = 20;
@ -71,7 +69,7 @@ public class AmqpSendReceiveTest extends AmqpClientTestSupport {
AmqpReceiver receiver2 = session.createReceiver("queue://" + getTestName());
receiver2.flow(200);
for (int i = 0; i < MSG_COUNT; ++i) {
received = receiver1.receive(5, TimeUnit.SECONDS);
received = receiver2.receive(5, TimeUnit.SECONDS);
assertEquals("msg" + i, received.getMessageId());
}