Code simplification.

git-svn-id: https://svn.apache.org/repos/asf/lenya/branches/BRANCH_2_1_X@1430327 13f79535-47bb-0310-9956-ffa450edef68
Add test case for issue 44035.

git-svn-id: https://svn.apache.org/repos/asf/lenya/branches/BRANCH_2_1_X@1430328 13f79535-47bb-0310-9956-ffa450edef68