Author: rgodfrey
Date: Mon Feb 19 02:29:23 2007
New Revision: 509147
URL: http://svn.apache.org/viewvc?view=rev&rev=509147
Log:
QPID-375 : Default Exchange fixes
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java?view=diff&rev=509147&r1=509146&r2=509147
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
Mon Feb 19 02:29:23 2007
@@ -84,8 +84,14 @@
public Exchange getExchange(AMQShortString name)
{
-
- return _exchangeMap.get(name);
+ if((name == null) || name.length() == 0)
+ {
+ return getDefaultExchange();
+ }
+ else
+ {
+ return _exchangeMap.get(name);
+ }
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java?view=diff&rev=509147&r1=509146&r2=509147
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
Mon Feb 19 02:29:23 2007
@@ -131,7 +131,7 @@
AMQBindingURL dest = new AMQBindingURL(url);
assertTrue(dest.getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS));
-
assertTrue(dest.getExchangeName().equals(ExchangeDefaults.DEFAULT_EXCHANGE_NAME));
+ assertTrue(dest.getExchangeName().equals(""));
assertTrue(dest.getDestinationName().equals(""));
assertTrue(dest.getQueueName().equals("IBMPerfQueue1"));
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java?view=diff&rev=509147&r1=509146&r2=509147
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
Mon Feb 19 02:29:23 2007
@@ -24,7 +24,7 @@
public class ExchangeDefaults
{
- public final static AMQShortString DEFAULT_EXCHANGE_NAME = new
AMQShortString("");
+ public final static AMQShortString DEFAULT_EXCHANGE_NAME = new
AMQShortString("<<default>>");
public final static AMQShortString TOPIC_EXCHANGE_NAME = new
AMQShortString("amq.topic");
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java?view=diff&rev=509147&r1=509146&r2=509147
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
Mon Feb 19 02:29:23 2007
@@ -62,7 +62,7 @@
if (exchangeClass == null)
{
_url = ExchangeDefaults.DIRECT_EXCHANGE_CLASS + "://" +
- ExchangeDefaults.DEFAULT_EXCHANGE_NAME + "//" + _url;
+ "" + "//" + _url;
//URLHelper.parseError(-1, "Exchange Class not specified.",
_url);
parseBindingURL();
return;
@@ -78,7 +78,7 @@
{
if(getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
{
- setExchangeName(ExchangeDefaults.DEFAULT_EXCHANGE_NAME);
+ setExchangeName("");
}
else
{
