ported fix to trunk : http://issues.apache.org/activemq/browse/AMQ-1172 http://issues.apache.org/activemq/browse/AMQ-1174 http://issues.apache.org/activemq/browse/AMQ-1175