Author: swd847 Date: 2010-03-09 01:57:50 -0500 (Tue, 09 Mar 2010) New Revision: 12127 Modified: branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java Log: JBSEAM-4590 Modified: branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java =================================================================== --- branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2010-03-09 01:52:36 UTC (rev 12126) +++ branches/community/Seam_2_2/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2010-03-09 06:57:50 UTC (rev 12127) @@ -30,9 +30,9 @@ public void create() { // TODO A bit of a hack, we should store the servlet context properly - if (ServletLifecycle.getServletContext() != null) + if (ServletLifecycle.getCurrentServletContext() != null) { - servletContext = ServletLifecycle.getServletContext(); + servletContext = ServletLifecycle.getCurrentServletContext(); } else {