You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/08/16 09:14:52 UTC
svn commit: r566515 -
/myfaces/core/branches/1_2_1/api/src/main/java/javax/faces/webapp/FacesServlet.java
Author: matzew
Date: Thu Aug 16 00:14:51 2007
New Revision: 566515
URL: http://svn.apache.org/viewvc?view=rev&rev=566515
Log:
minor correction
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=566515&r1=566514&r2=566515
==============================================================================
--- 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:14:51 2007
@@ -84,8 +84,8 @@
//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);
+ String appLifecycleId = _servletConfig.getServletContext().getInitParameter(LIFECYCLE_ID_ATTR);
appLifecycleId = serLifecycleId == null ? appLifecycleId : serLifecycleId;
return appLifecycleId != null ? appLifecycleId : LifecycleFactory.DEFAULT_LIFECYCLE;
}