nullpointer fix

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/trunk@1629173 13f79535-47bb-0310-9956-ffa450edef68
pmd violation fix

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/trunk@1629175 13f79535-47bb-0310-9956-ffa450edef68
pmd violation fix.

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