ACE-494 Fixed and added a test.

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