fix for: https://issues.apache.org/jira/browse/AMQ-3199 fix for: https://issues.apache.org/jira/browse/AMQ-3200