- removed cluster methods in mgnt, will add them to a new cluster object in

upcoming commit
- added flag on connection object to mark user versus system connections
- added help text



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

2 files changed, 5 insertions, 4 deletions

diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index d07517fee2..a56b2bd392 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -349,8 +349,7 @@ Manageable::status_t Broker::ManagementMethod (uint32_t methodId,
         status = Manageable::STATUS_OK;
         break;
       }
-    case management::Broker::METHOD_JOINCLUSTER :
-    case management::Broker::METHOD_LEAVECLUSTER :
+   default:
         status = Manageable::STATUS_NOT_IMPLEMENTED;
         break;
     }
diff --git a/qpid/cpp/src/qpid/broker/Connection.cpp b/qpid/cpp/src/qpid/broker/Connection.cpp
index 4be831a9cb..5bc3c175b3 100644
--- a/qpid/cpp/src/qpid/broker/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/Connection.cpp
@@ -64,9 +64,11 @@ Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_, const std
     if (parent != 0)
     {
         ManagementAgent* agent = ManagementAgent::Singleton::getInstance();
-
+		
+		
+        // TODO set last bool true if system connection
         if (agent != 0)
-            mgmtObject = new management::Connection(agent, this, parent, mgmtId, !isLink);
+            mgmtObject = new management::Connection(agent, this, parent, mgmtId, !isLink,false);
         agent->addObject(mgmtObject);
     }
 }