Put in another write lock, and also refactor to make use of java 1.5 constructs.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-781@1542743 13f79535-47bb-0310-9956-ffa450edef68