Author: rgodfrey
Date: Thu Dec 3 12:07:23 2015
New Revision: 1717743
URL: http://svn.apache.org/viewvc?rev=1717743&view=rev
Log:
QPID-6928 : null or empty string target destinations should route to the
default destination of the virtual host
Merged from trunk with command:
svn merge -c 1717735 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 3 12:07:23 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717691
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717691,1717735
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1717743&r1=1717742&r2=1717743&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Thu Dec 3 12:07:23 2015
@@ -331,7 +331,13 @@ public class Session_1_0 implements Sess
}
String addr = target.getAddress();
- if(!addr.startsWith("/") && addr.contains("/"))
+ if(addr == null || "".equals(addr.trim()))
+ {
+ MessageDestination messageDestination =
getVirtualHost().getDefaultDestination();
+ destination = new
NodeReceivingDestination(messageDestination, target.getDurable(),
+
target.getExpiryPolicy());
+ }
+ else if(!addr.startsWith("/") && addr.contains("/"))
{
String[] parts = addr.split("/",2);
ExchangeImpl exchange =
getVirtualHost().getAttainedExchange(parts[0]);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
