2 files changed, 5 insertions, 2 deletions
diff --git a/qpid/cpp/managementgen/qmf/schema.py b/qpid/cpp/managementgen/qmf/schema.py
index 7f008c19e3..72ee762fc5 100755
--- a/qpid/cpp/managementgen/qmf/schema.py
+++ b/qpid/cpp/managementgen/qmf/schema.py
@@ -810,8 +810,10 @@ class SchemaEvent:
     for item in self.packageName.split("."):
       stream.write ("namespace %s {\n" % item)
 
+  def genSeverity(self, stream, variables):
+    stream.write("%d" % self.sev)
+
   def genArgEncodes(self, stream, variables):
-    stream.write("    buf.putOctet(%d);\n" % self.sev)
     for arg in self.args:
       stream.write("    " + arg.type.type.encode.replace("@", "buf").replace("#", arg.name) + ";\n")
 
diff --git a/qpid/cpp/managementgen/qmf/templates/Event.h b/qpid/cpp/managementgen/qmf/templates/Event.h
index a943c0c501..b5c2a211d1 100644
--- a/qpid/cpp/managementgen/qmf/templates/Event.h
+++ b/qpid/cpp/managementgen/qmf/templates/Event.h
@@ -44,12 +44,13 @@ class Event/*MGEN:Event.NameCap*/ : public ::qpid::management::ManagementEvent
     writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; }
 
     Event/*MGEN:Event.NameCap*/(/*MGEN:Event.ConstructorArgs*/);
-    ~Event/*MGEN:Class.NameCap*/() {};
+    ~Event/*MGEN:Event.NameCap*/() {};
 
     static void registerSelf(::qpid::management::ManagementAgent* agent);
     std::string& getPackageName() const { return packageName; }
     std::string& getEventName() const { return eventName; }
     uint8_t* getMd5Sum() const { return md5Sum; }
+    uint8_t getSeverity() const { return /*MGEN:Event.Severity*/; }
     void encode(::qpid::framing::Buffer& buffer) const;
 };