[jboss-cvs] JBossAS SVN: r82008 - branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/jsf/integration/config.

[jboss-cvs-commits at lists.jboss.org]

Author: stan.silvert at jboss.com
Date: 2008-12-03 09:35:04 -0500 (Wed, 03 Dec 2008)
New Revision: 82008

Modified:
   branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
Log:
JBPAPP-1460 Upgrade JSF to 1.2_10


Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2008-12-03 11:42:50 UTC (rev 82007)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java	2008-12-03 14:35:04 UTC (rev 82008)
@@ -49,6 +49,8 @@
     
     private ServletContext servletContext;
     
+    private boolean initialized = false;
+
     public static boolean warBundlesJSFImpl(ServletContext servletContext)
     {
        String bundledJSFImpl = servletContext.getInitParameter(WAR_BUNDLES_JSF_IMPL);
@@ -70,8 +72,18 @@
 
         checkForMyFaces();
         initializeJspRuntime();
+        initialized = true;
         super.contextInitialized(event);
     }
+
+    public void contextDestroyed(ServletContextEvent event) 
+    {
+        if (initialized)
+        {
+           initialized = false;
+           super.contextDestroyed(event);
+        }
+    }
     
     // This method accounts for a peculiar problem with Jasper that pops up from time
     // to time.  In some cases, if the JspRuntimeContext is not loaded then the JspFactory