From 0963c9f7a673b480cb26fc91215f48ddc5d7f769 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 11 Oct 2012 19:23:30 +0000 Subject: Bug 860701 - QPID-4350: HA handle auto-delete queues Subscribed auto-delete queues are deleted by the backup. Timed auto-delete queues are deleted after the timeout. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1397243 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/managementgen/qmfgen/templates/Event.cpp | 12 ++++++------ cpp/managementgen/qmfgen/templates/Event.h | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'cpp/managementgen') diff --git a/cpp/managementgen/qmfgen/templates/Event.cpp b/cpp/managementgen/qmfgen/templates/Event.cpp index a6043ffa15..46720e683e 100644 --- a/cpp/managementgen/qmfgen/templates/Event.cpp +++ b/cpp/managementgen/qmfgen/templates/Event.cpp @@ -35,8 +35,8 @@ using qpid::management::Args; using qpid::management::Mutex; using std::string; -string Event/*MGEN:Event.NameCap*/::packageName = string ("/*MGEN:Event.NamePackageLower*/"); -string Event/*MGEN:Event.NameCap*/::eventName = string ("/*MGEN:Event.Name*/"); +string Event/*MGEN:Event.NameCap*/::PACKAGE_NAME = string ("/*MGEN:Event.NamePackageLower*/"); +string Event/*MGEN:Event.NameCap*/::EVENT_NAME = string ("/*MGEN:Event.Name*/"); uint8_t Event/*MGEN:Event.NameCap*/::md5Sum[16] = {/*MGEN:Event.SchemaMD5*/}; @@ -54,7 +54,7 @@ namespace { void Event/*MGEN:Event.NameCap*/::registerSelf(ManagementAgent* agent) { - agent->registerEvent(packageName, eventName, md5Sum, writeSchema); + agent->registerEvent(PACKAGE_NAME, EVENT_NAME, md5Sum, writeSchema); } void Event/*MGEN:Event.NameCap*/::writeSchema (std::string& schema) @@ -66,8 +66,8 @@ void Event/*MGEN:Event.NameCap*/::writeSchema (std::string& schema) // Schema class header: buf.putOctet (CLASS_KIND_EVENT); - buf.putShortString (packageName); // Package Name - buf.putShortString (eventName); // Event Name + buf.putShortString (PACKAGE_NAME); // Package Name + buf.putShortString (EVENT_NAME); // Event Name buf.putBin128 (md5Sum); // Schema Hash buf.putShort (/*MGEN:Event.ArgCount*/); // Argument Count @@ -102,5 +102,5 @@ void Event/*MGEN:Event.NameCap*/::mapEncode(::qpid::types::Variant::Map& map) co bool Event/*MGEN:Event.NameCap*/::match(const std::string& evt, const std::string& pkg) { - return eventName == evt && packageName == pkg; + return EVENT_NAME == evt && PACKAGE_NAME == pkg; } diff --git a/cpp/managementgen/qmfgen/templates/Event.h b/cpp/managementgen/qmfgen/templates/Event.h index 592ae08c73..b6d35a7355 100644 --- a/cpp/managementgen/qmfgen/templates/Event.h +++ b/cpp/managementgen/qmfgen/templates/Event.h @@ -33,21 +33,22 @@ QPID_BROKER_CLASS_EXTERN class Event/*MGEN:Event.NameCap*/ : public ::qpid::mana { private: static void writeSchema (std::string& schema); - static std::string packageName; - static std::string eventName; static uint8_t md5Sum[MD5_LEN]; /*MGEN:Event.ArgDeclarations*/ public: + static std::string PACKAGE_NAME; + static std::string EVENT_NAME; + writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; } QPID_BROKER_EXTERN Event/*MGEN:Event.NameCap*/(/*MGEN:Event.ConstructorArgs*/); QPID_BROKER_EXTERN ~Event/*MGEN:Event.NameCap*/() {}; static void registerSelf(::qpid::management::ManagementAgent* agent); - std::string& getPackageName() const { return packageName; } - std::string& getEventName() const { return eventName; } + std::string& getPackageName() const { return PACKAGE_NAME; } + std::string& getEventName() const { return EVENT_NAME; } uint8_t* getMd5Sum() const { return md5Sum; } uint8_t getSeverity() const { return /*MGEN:Event.Severity*/; } QPID_BROKER_EXTERN void encode(std::string& buffer) const; -- cgit v1.2.1