Author: rgodfrey
Date: Sat Mar 8 10:52:23 2014
New Revision: 1575507
URL: http://svn.apache.org/r1575507
Log:
QPID-5601 : Allow for messages with null routing keys
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java?rev=1575507&r1=1575506&r2=1575507&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
Sat Mar 8 10:52:23 2014
@@ -58,7 +58,7 @@ public class DefaultDestination implemen
final AMQQueue q = _virtualHost.getQueue(routingAddress);
if(q == null)
{
- if(routingAddress.contains("/") && !routingAddress.startsWith("/"))
+ if(routingAddress != null && routingAddress.contains("/") &&
!routingAddress.startsWith("/"))
{
String[] parts = routingAddress.split("/",2);
ExchangeImpl exchange = _virtualHost.getExchange(parts[0]);
@@ -67,7 +67,7 @@ public class DefaultDestination implemen
return exchange.send(message, parts[1],
instanceProperties, txn, postEnqueueAction);
}
}
- else if(!routingAddress.contains("/"))
+ else if(routingAddress == null || !routingAddress.contains("/"))
{
ExchangeImpl exchange =
_virtualHost.getExchange(routingAddress);
if(exchange != null)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java?rev=1575507&r1=1575506&r2=1575507&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
Sat Mar 8 10:52:23 2014
@@ -182,7 +182,7 @@ public class DefaultExchangeRegistry imp
public ExchangeImpl<?> getExchange(String name)
{
- return _exchangeMap.get(name);
+ return name == null ? null : _exchangeMap.get(name);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
