Description of problem:

Message id is internally converted to the uuid even if uuid format is given, which leads to inconsistent message id between sent and received message.

Note: C++ and other supported clients do not suffer from that.

Reproducer may be found in attachment.

Version-Release number of selected component (if applicable):
for mrg-m-2.5.5:
python-qpid-0.18-13
qpid-cpp-*-0.18-35

for mrg-m-3.0:
python-qpid-0.22-18
qpid-cpp-*-0.22-49

How reproducible:
100%

Steps to Reproduce:
1. run the reproducer
2. realize that the id of message sent is different from id of message received
ie:
sendt message id: 708de8fc-4f30-4603-8ae4-29b1565adff6
received message id: 37303864-6538-6663-2d34-6633302d3436


Actual results:
Inconsistent message id on sent/received message

Expected results:
Consistent message id on sent/received message

Additional info:

#!/usr/bin/env python

from qpid.messaging import *
from uuid import uuid4

addr = "queue;{create:sender,delete:receiver}"
conn = Connection('localhost')

try:
  conn.open()
  ssn = conn.session()
  snd = ssn.sender(addr)
  rcv = ssn.receiver(addr)
  s_msg = Message()
  s_msg.id = str(uuid4())

  snd.send(s_msg)
  r_msg = rcv.fetch(0)
  print "sent message id: %s" % s_msg.id
  print "received message id: %s" % r_msg.id
  ssn.acknowledge()

except MessagingError, e:
  print e

conn.close()