This was done before on HornetQ 2.1's branch, but we need to reapply the diffs now.

If you go to this following branch:

https://svn.jboss.org/repos/hornetq/branches/Branch_2_1_inactive_dont_use

The following diff will be useful to complete this task:

svn diff -r9658:9659

and

svn diff -r9662:9663