fix a bug that crept in and refactor a bit

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/weaver/trunk@1600379 13f79535-47bb-0310-9956-ffa450edef68