svn commit: r566514 - /myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java

[ma...@apache.org]

Author: matzew
Date: Thu Aug 16 00:10:38 2007
New Revision: 566514

URL: http://svn.apache.org/viewvc?view=rev&rev=566514
Log:
MYFACES-1244

JSR-252 Issue #95: Allow multiple instances of FacesServlet in a single webapp, mapped with different URI mappings, to use different implementations of Lifecycle
thanks to Christoph Ebner / Bernhard Huemer for the patch

Modified:
    myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java

Modified: myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java?view=diff&rev=566514&r1=566513&r2=566514
==============================================================================
--- myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java (original)
+++ myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java Thu Aug 16 00:10:38 2007
@@ -81,8 +81,13 @@
 
     private String getLifecycleId()
     {
-        String lifecycleId = _servletConfig.getServletContext().getInitParameter(LIFECYCLE_ID_ATTR);
-        return lifecycleId != null ? lifecycleId : LifecycleFactory.DEFAULT_LIFECYCLE;
+        //1. check for Servlet's init-param
+        //2. check for global context parameter
+        //3. use default Lifecycle Id, if none of them was provided
+        String appLifecycleId = _servletConfig.getServletContext().getInitParameter(LIFECYCLE_ID_ATTR);
+        String serLifecycleId = _servletConfig.getInitParameter(LIFECYCLE_ID_ATTR);
+        appLifecycleId = serLifecycleId == null ? appLifecycleId : serLifecycleId;
+        return appLifecycleId != null ? appLifecycleId : LifecycleFactory.DEFAULT_LIFECYCLE;
     }
 
     public void init(ServletConfig servletConfig)