QPID-4000 , QPID-5601 : Improve conversion of reply-to between different protocols. Add functionality to the default exchange to understand AMQP 1.0 addresses.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1574551 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 3 deletions

diff --git a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
index 6029b09466..a6c5131222 100644
--- a/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
+++ b/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
@@ -44,6 +44,7 @@ import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.protocol.MessageConverterRegistry;
 import org.apache.qpid.server.store.StorableMessageMetaData;
 import org.apache.qpid.server.store.TransactionLogResource;
+import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
 import org.apache.qpid.server.util.StateChangeListener;
@@ -261,9 +262,10 @@ class ManagementNode implements MessageSource, MessageDestination
 
     @Override
     public  <M extends ServerMessage<? extends StorableMessageMetaData>> int send(final M message,
-                    final InstanceProperties instanceProperties,
-                    final ServerTransaction txn,
-                    final Action<? super MessageInstance> postEnqueueAction)
+                                                                                  final String routingAddress,
+                                                                                  final InstanceProperties instanceProperties,
+                                                                                  final ServerTransaction txn,
+                                                                                  final Action<? super MessageInstance> postEnqueueAction)
     {
 
         @SuppressWarnings("unchecked")
@@ -361,11 +363,19 @@ class ManagementNode implements MessageSource, MessageDestination
 
 
         ManagementNodeConsumer consumer = _consumers.get(message.getMessageHeader().getReplyTo());
+        response.setInitialRoutingAddress(message.getMessageHeader().getReplyTo());
         if(consumer != null)
         {
             // TODO - check same owner
             consumer.send(response);
         }
+        else
+        {
+            _virtualHost.getDefaultDestination().send(response,
+                                                      message.getMessageHeader().getReplyTo(), InstanceProperties.EMPTY,
+                                                      new AutoCommitTransaction(_virtualHost.getMessageStore()),
+                                                      null);
+        }
         // TODO - route to a queue
 
     }