ACE-493 Fixed the issue and added some tests for it.

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