An at attempt to fix: Potential Memory Leak reported by Tomcat 7 - TRUNK-3056

An at attempt to fix: Potential Memory Leak reported by Tomcat 7 - TRUNK-3056