More DOOM fixes.

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