https://issues.apache.org/jira/browse/AMQCPP-585

Fix and test.
3 files changed