Fixes and automated tests for federation function.

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

1 files changed, 1 insertions, 3 deletions

diff --git a/cpp/src/qpid/broker/Bridge.cpp b/cpp/src/qpid/broker/Bridge.cpp
index 566b9cc197..32819380de 100644
--- a/cpp/src/qpid/broker/Bridge.cpp
+++ b/cpp/src/qpid/broker/Bridge.cpp
@@ -49,8 +49,6 @@ void Bridge::create()
     framing::AMQP_ServerProxy::Session session(channel);
     session.open(0);
 
-    //peer.getSession().open(0);
-
     if (args.i_src_is_local) {
         //TODO: handle 'push' here... simplest way is to create frames and pass them to Connection::received()
     } else {
@@ -62,7 +60,7 @@ void Bridge::create()
             string queue = "bridge_queue_";
             queue += Uuid(true).str();
             peer.getQueue().declare(0, queue, "", false, false, true, true, FieldTable());
-            peer.getQueue().bind(0, queue, args.i_dest, args.i_key, FieldTable());
+            peer.getQueue().bind(0, queue, args.i_src, args.i_key, FieldTable());
             peer.getMessage().subscribe(0, queue, args.i_dest, false, 0, 0, false, FieldTable());
             peer.getMessage().flow(args.i_dest, 0, 0xFFFFFFFF);
             peer.getMessage().flow(args.i_dest, 1, 0xFFFFFFFF);