diff options
| author | Ted Ross <tross@apache.org> | 2012-11-20 17:46:05 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2012-11-20 17:46:05 +0000 |
| commit | 8f018f8ba58de057fea23acb9f230a922ca501ab (patch) | |
| tree | ac959e2c4e08d15ce1e3e42a03d04b960e3218a3 /qpid/cpp/managementgen | |
| parent | 591c8a77908553827985e930e176d3403be86d52 (diff) | |
| download | qpid-python-8f018f8ba58de057fea23acb9f230a922ca501ab.tar.gz | |
QPID-4449 - Fixed the API in qpid::management::Manageable to remain backward compatible.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1411761 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/managementgen')
| -rwxr-xr-x | qpid/cpp/managementgen/qmf-gen | 2 | ||||
| -rwxr-xr-x | qpid/cpp/managementgen/qmfgen/schema.py | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/qpid/cpp/managementgen/qmf-gen b/qpid/cpp/managementgen/qmf-gen index 2f0cc0d8fd..fc2f284578 100755 --- a/qpid/cpp/managementgen/qmf-gen +++ b/qpid/cpp/managementgen/qmf-gen @@ -68,9 +68,11 @@ vargs = {} if opts.brokerplugin: vargs["agentHeaderDir"] = "management" vargs["genQmfV1"] = True + vargs["genForBroker"] = True else: vargs["agentHeaderDir"] = "agent" vargs["genQmfV1"] = None + vargs["genForBroker"] = None if opts.qpidlogs: vargs["genLogs"] = True diff --git a/qpid/cpp/managementgen/qmfgen/schema.py b/qpid/cpp/managementgen/qmfgen/schema.py index dc8ffae446..9ed131e571 100755 --- a/qpid/cpp/managementgen/qmfgen/schema.py +++ b/qpid/cpp/managementgen/qmfgen/schema.py @@ -1520,8 +1520,12 @@ class SchemaClass: def genParentRefAssignment (self, stream, variables): for config in self.properties: if config.isParentRef == 1: - stream.write (config.getName () + \ - " = _parent->GetManagementObject ()->getObjectId ();") + if variables['genForBroker']: + stream.write (config.getName () + \ + " = _parent->GetManagementObjectShared()->getObjectId ();") + else: + stream.write (config.getName () + \ + " = _parent->GetManagementObject()->getObjectId ();") return def genSchemaMD5 (self, stream, variables): |