hornetq/hornetq — pull request #1666 by asimmahmood (2014-06-09 16:15:14+00:00)
Title: https://issues.jboss.org/browse/HORNETQ-1351

cherry-picked the fix for HORNETQ-1351 into 2.3 branch.