CLEREZZA-831: added more locking

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