You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2008/02/27 21:01:13 UTC
svn commit: r631698 -
/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Author: rajith
Date: Wed Feb 27 12:01:12 2008
New Revision: 631698
URL: http://svn.apache.org/viewvc?rev=631698&view=rev
Log:
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.
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=631698&r1=631697&r2=631698&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java Wed Feb 27 12:01:12 2008
@@ -274,19 +274,19 @@
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)