Author: pete.muir(a)jboss.org Date: 2009-04-05 21:12:27 -0400 (Sun, 05 Apr 2009) New Revision: 2310 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java Log: minor Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-04-06 00:39:03 UTC (rev 2309) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-04-06 01:12:27 UTC (rev 2310) @@ -41,7 +41,14 @@ */ public static ManagerImpl rootManager() { - return managers.get(rootManagerId); + if (rootManagerId == null) + { + return null; + } + else + { + return managers.get(rootManagerId); + } } /**