summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2009-06-19 20:46:05 +0000
committerTed Ross <tross@apache.org>2009-06-19 20:46:05 +0000
commitd8861ac8381d1feaf53c5af668a7c323ce3eac84 (patch)
tree8555340364f9575804cea962fd59c21db4aaeaad
parent95ffd04aa91e6af9cd7eef45a6e724b6559027db (diff)
downloadqpid-python-d8861ac8381d1feaf53c5af668a7c323ce3eac84.tar.gz
QPID-1920 - bug fix patch from Bryan Kearney
Python Console puts presence masks in the wrong location when marshalling unmanaged objects git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@786661 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/python/qmf/console.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/qpid/python/qmf/console.py b/qpid/python/qmf/console.py
index 36553562f7..1527c7849a 100644
--- a/qpid/python/qmf/console.py
+++ b/qpid/python/qmf/console.py
@@ -347,6 +347,12 @@ class Object(object):
raise Exception("Invalid Method (software defect) [%s]" % name)
def _encodeUnmanaged(self, codec):
+
+ codec.write_uint8(20)
+ codec.write_str8(self._schema.getKey().getPackageName())
+ codec.write_str8(self._schema.getKey().getClassName())
+ codec.write_bin128(self._schema.getKey().getHash())
+
# emit presence masks for optional properties
mask = 0
bit = 0
@@ -362,12 +368,7 @@ class Object(object):
codec.write_uint8(mask)
mask = 0
if bit != 0:
- codec.write_uint8(mask)
-
- codec.write_uint8(20)
- codec.write_str8(self._schema.getKey().getPackageName())
- codec.write_str8(self._schema.getKey().getClassName())
- codec.write_bin128(self._schema.getKey().getHash())
+ codec.write_uint8(mask)
# encode properties
for prop, value in self._properties: