X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fcdi%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fcdi%2FBeanManagerLookup.java;h=87a578f176caa8c77d2ff6b6667e3114e32fb208;hb=7e32fa328e2d7c94681028fb008d82ec551363ff;hp=50bed00a907aae1be4913e5a3108da8b75f6944b;hpb=6842c70f307b15a239f8298749507b1ab8b6fd90;p=utils diff --git a/support/cdi/src/main/java/org/wamblee/cdi/BeanManagerLookup.java b/support/cdi/src/main/java/org/wamblee/cdi/BeanManagerLookup.java index 50bed00a..87a578f1 100644 --- a/support/cdi/src/main/java/org/wamblee/cdi/BeanManagerLookup.java +++ b/support/cdi/src/main/java/org/wamblee/cdi/BeanManagerLookup.java @@ -23,7 +23,7 @@ import javax.naming.NamingException; /** * Class that encapsulates beanmanager lookup in a way so that the lookup can be - * explicitly overriden (e.g. for unit test). + * explicitly overriden (for instance for unit test). * * In case no bean manager is found the beanmanager is set to null and the * problem is logged. @@ -36,7 +36,7 @@ public class BeanManagerLookup { .getLogger(BeanManagerLookup.class.getName()); public static final String BEAN_MANAGER_JNDI = "java:comp/BeanManager"; - private static BeanManager mgr = null; + private static BeanManager BEAN_MANAGER = null; /** * Sets the bean manager (mainly for testability). @@ -45,7 +45,7 @@ public class BeanManagerLookup { * Bean manager. */ public static void setBeanManager(BeanManager aMgr) { - mgr = aMgr; + BEAN_MANAGER = aMgr; } /** @@ -54,16 +54,16 @@ public class BeanManagerLookup { * @return Bean manager. */ public static BeanManager lookup() { - if (mgr == null) { + if (BEAN_MANAGER == null) { try { InitialContext ctx = new InitialContext(); - mgr = (BeanManager) ctx.lookup(BEAN_MANAGER_JNDI); + BEAN_MANAGER = (BeanManager) ctx.lookup(BEAN_MANAGER_JNDI); LOGGER.info("Beanmanager successfully located"); } catch (NamingException e) { LOGGER.warning("No beanmanager was found, using null"); - mgr = null; + BEAN_MANAGER = null; } } - return mgr; + return BEAN_MANAGER; } }