ACE-464 Improved the code, added a test to ensure we did not introduce concurrency issues.

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