summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2010-07-28 22:47:10 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2010-07-28 22:47:10 +0000
commit09c4ebc1ca200b2e985b05cd310fc96c9537625f (patch)
treeb2ec7573955d669e80a42c81ff8df61fe158340d
parent17d3396edf041440c05ec447b72d25eda5068f5e (diff)
downloadqpid-python-09c4ebc1ca200b2e985b05cd310fc96c9537625f.tar.gz
QPID-2774
If the exchange type is not specified, then it is set to null when parsing the string. If the exchange needs to be created, it's set to 'topic' if the exchange type is null. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@980259 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java b/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
index 989e0c6fbd..2e165954a6 100644
--- a/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
+++ b/java/client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQDestination.Binding;
+import org.apache.qpid.client.messaging.address.Link.Reliability;
import org.apache.qpid.client.messaging.address.Node.ExchangeNode;
import org.apache.qpid.client.messaging.address.Node.QueueNode;
import org.apache.qpid.client.messaging.address.Node.UnknownNodeType;
@@ -257,7 +258,7 @@ public class AddressHelper
MapAccessor argsMap = new MapAccessor(declareArgs);
ExchangeNode node = new ExchangeNode();
node.setExchangeType(argsMap.getString(TYPE) == null?
- "topic":argsMap.getString(TYPE));
+ null:argsMap.getString(TYPE));
node.setDeclareArgs(getQpidExchangeOptions(argsMap));
fillInCommonNodeArgs(node,parent,argsMap);
return node;
@@ -316,7 +317,7 @@ public class AddressHelper
{
link.setDurable(linkProps.getBoolean(DURABLE)== null? false : linkProps.getBoolean(DURABLE));
link.setName(linkProps.getString(NAME));
-
+
if (((Map)address.getOptions().get(LINK)).get(CAPACITY) instanceof Map)
{
MapAccessor capacityProps = new MapAccessor(