SW-796: fixed tObservationStartListener

LCS/MessageBus/src/message.py

@@ -194,6 +194,10 @@ class MessageContent(object):
         # builds, skip encode if XML tags continue in <payload>. Hack ahead!
         if qpidMsg.body is None:
           qpidMsg.body = ''  # avoid find() or replace() via escape() on None
+
+        if isinstance(qpidMsg.body, bytes):
+            qpidMsg.body = qpidMsg.body.decode('utf-8')
+
         plIdx = qpidMsg.body.find('<payload>')
         if plIdx != -1:
           plIdx += len('<payload>')

LCS/MessageDaemons/ObservationStartListener/src/ObservationStartListener.py

@@ -120,7 +120,7 @@ def processMessages(receiver, matchPrefix, execPath, msgSaveDir):
                 messageFilename = msgSaveDir + 'L' + obsId + '.parset.xml'
 
                 try:
-                    saveData(messageFilename, message)
+                    saveData(messageFilename, message.encode('utf-8'))
 
                     hosts = uniq(hosts)
                     hosts.sort()
@@ -139,7 +139,7 @@ def processMessages(receiver, matchPrefix, execPath, msgSaveDir):
 
         finally:
             if msg is not None:
-                receiver.ack()  # optional for topics, needed for queues
+                receiver.ack(msg)  # optional for topics, needed for queues
 
 def run(broker, address, matchPrefix, execPath, msgSaveDir):
     # Receiver test: qpid-receive -b broker_hostname -a queue_or_exchange_name -f -m 1