ported fix to trunk : http://issues.apache.org/activemq/browse/AMQ-1179 http://issues.apache.org/activemq/browse/AMQ-1180