updating evolution from hornetq's code