ensure subs tracking is in try...finally
Updated to spring 3.2.0.RELEASE