Repository: tomee Updated Branches: refs/heads/master ad740f223 -> 345967ac9
skip reflection for default case for readability Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/345967ac Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/345967ac Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/345967ac Branch: refs/heads/master Commit: 345967ac9e0b2aa0c42953dbee0fa09f30d0a665 Parents: ad740f2 Author: Romain Manni-Bucau <[email protected]> Authored: Wed Jun 17 14:52:18 2015 +0200 Committer: Romain Manni-Bucau <[email protected]> Committed: Wed Jun 17 14:52:18 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/tomee/catalina/TomcatLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/345967ac/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java index 422df7a..aaec6ab 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java @@ -285,9 +285,9 @@ public class TomcatLoader implements Loader { final ClassLoader cl = TomcatLoader.class.getClassLoader(); if (SystemInstance.get().getOptions().get("openejb.servicemanager.enabled", true)) { - final String clazz = SystemInstance.get().getOptions().get("openejb.service.manager.class", "org.apache.tomee.catalina.TomEEServiceManager"); + final String clazz = SystemInstance.get().getOptions().get("openejb.service.manager.class", (String) null); try { - manager = (ServiceManager) cl.loadClass(clazz).newInstance(); + manager = clazz == null ? new TomEEServiceManager() : (ServiceManager) cl.loadClass(clazz).newInstance(); } catch (final ClassNotFoundException cnfe) { logger.severe("can't find the service manager " + clazz + ", the TomEE one will be used"); manager = new TomEEServiceManager();
