You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/07/27 14:44:39 UTC
[3/4] qpid-broker-j git commit: QPID-7434: Fix handling of default
destination on conversion from 0-8
QPID-7434: Fix handling of default destination on conversion from 0-8
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/bfb48c7a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/bfb48c7a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/bfb48c7a
Branch: refs/heads/master
Commit: bfb48c7a2e9841d60cdd8f6cc9597acf2106f7dc
Parents: 46983ff
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Jul 26 16:09:59 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu Jul 27 15:44:03 2017 +0100
----------------------------------------------------------------------
.../converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java | 2 +-
.../converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java | 4 ++--
.../converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bfb48c7a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
index bdf9daa..7540e48 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
@@ -196,7 +196,7 @@ public class MessageConverter_0_8_to_0_10 implements MessageConverter<AMQMessag
}
String exchangeName = burl.getExchangeName();
- if(exchangeName != null)
+ if(exchangeName != null && !"".equals(exchangeName))
{
replyTo.setExchange(exchangeName);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bfb48c7a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
index 2a9aa78..56db885 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
@@ -216,7 +216,7 @@ public class PropertyConverter_0_8_to_0_10Test extends QpidTestCase
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
- assertEquals("Unexpected reply-to exchange", "", messageProperties.getReplyTo().getExchange());
+ assertNull("Unexpected reply-to exchange", messageProperties.getReplyTo().getExchange());
assertEquals("Unexpected reply-to routing-key", "queue_name", messageProperties.getReplyTo().getRoutingKey());
}
@@ -232,7 +232,7 @@ public class PropertyConverter_0_8_to_0_10Test extends QpidTestCase
final MessageProperties messageProperties =
convertedMessage.getStoredMessage().getMetaData().getMessageProperties();
- assertEquals("Unexpected reply-to exchange", "", messageProperties.getReplyTo().getExchange());
+ assertNull("Unexpected reply-to exchange", messageProperties.getReplyTo().getExchange());
assertEquals("Unexpected reply-to routing-key", "test_routing_key", messageProperties.getReplyTo().getRoutingKey());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bfb48c7a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
index 2ea8398..357ce98 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
@@ -183,7 +183,7 @@ public class MessageConverter_0_8_to_1_0 extends MessageConverter_to_1_0<AMQMess
if (messagePublishInfo.getRoutingKey() != null)
{
String routingKey = AMQShortString.toString(messagePublishInfo.getRoutingKey());
- if (to != null)
+ if (to != null && !"".equals(to))
{
to += "/" + routingKey;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org