Hi I have created a PR (https://github.com/apache/tomee/pull/332) for (TOMEE-2435) Simplify the Code in org.apache.openejb.OpenEjbContainer$Provider <https://issues.apache.org/jira/browse/TOMEE-2435>
If anybody can check and merge, it is appreciated :) Regards. Gurkan