refactoring.

git-svn-id: https://svn.apache.org/repos/asf/james/hupa/trunk@1522219 13f79535-47bb-0310-9956-ffa450edef68
want to make it, never give it up

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