Management clean-up. Made the management broker more defensive with regard to received messages. Default and management exchanges now have 'durable' object IDs.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/cpp/src/qpid/broker/Exchange.cpp b/cpp/src/qpid/broker/Exchange.cpp
index 0d9ffb7122..30a93e338c 100644
--- a/cpp/src/qpid/broker/Exchange.cpp
+++ b/cpp/src/qpid/broker/Exchange.cpp
@@ -57,8 +57,14 @@ Exchange::Exchange(const string& _name, bool _durable, const qpid::framing::Fiel
         {
             mgmtExchange = management::Exchange::shared_ptr
                 (new management::Exchange (this, parent, _name, durable));
-            if (!durable)
-                agent->addObject (mgmtExchange);
+            if (!durable) {
+                if (name == "")
+                    agent->addObject (mgmtExchange, 4, 1);  // Special default exchange ID
+                else if (name == "qpid.management")
+                    agent->addObject (mgmtExchange, 5, 1);  // Special management exchange ID
+                else
+                    agent->addObject (mgmtExchange);
+            }
         }
     }
 }