no more need of this logic since it is done eagerly in core so simply route to the right method

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/trunk@1536352 13f79535-47bb-0310-9956-ffa450edef68
cleaning up no more used variables

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