cleanup and fix warnings. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428981 13f79535-47bb-0310-9956-ffa450edef68