Finish thread safety fix for TIKA-1387

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