summaryrefslogtreecommitdiff
path: root/java/client/src
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2008-02-27 20:01:12 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2008-02-27 20:01:12 +0000
commit12ea725d2b2cd95e9a8ef5f4b4511e841054b628 (patch)
treef0c8ecb6ff5c8061247650fe5e79f83d2da7fd9d /java/client/src
parenta9227dbda19f88d60689cf2c44940e3552a222e9 (diff)
downloadqpid-python-12ea725d2b2cd95e9a8ef5f4b4511e841054b628.tar.gz
Fixed the toString method to avoid printing both a routingkey and bindingkey and also to properly printout the bindingkeys when required.
This bug caused 3 test failures. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@631698 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client/src')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQDestination.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 0cf1cb32a1..e02b3d6643 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -274,19 +274,19 @@ public abstract class AMQDestination implements Destination, Referenceable
sb.append(URLHelper.DEFAULT_OPTION_SEPERATOR);
}
- if (_bindingKeys != null && _bindingKeys.length>0)
+ // We can't allow both routingKey and bindingKey
+ if (_routingKey == null && _bindingKeys != null && _bindingKeys.length>0)
{
- sb.append(BindingURL.OPTION_BINDING_KEY);
- sb.append("='");
+
for (AMQShortString bindingKey:_bindingKeys)
{
-
- sb.append(bindingKey).append(",");
+ sb.append(BindingURL.OPTION_BINDING_KEY);
+ sb.append("='");
+ sb.append(bindingKey);
+ sb.append("'");
+ sb.append(URLHelper.DEFAULT_OPTION_SEPERATOR);
}
- sb.deleteCharAt(sb.length() - 1);
- sb.append("'");
- sb.append(URLHelper.DEFAULT_OPTION_SEPERATOR);
}
if (_isDurable)