You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/06/19 18:36:25 UTC
svn commit: r669546 -
/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Author: lu4242
Date: Thu Jun 19 09:36:25 2008
New Revision: 669546
URL: http://svn.apache.org/viewvc?rev=669546&view=rev
Log:
MYFACES-1883 /WEB-INF/faces-config.xml Loaded twice if logging disabled.
Modified:
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=669546&r1=669545&r2=669546&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Thu Jun 19 09:36:25 2008
@@ -554,11 +554,14 @@
{
String systemId = st.nextToken().trim();
- if (log.isWarnEnabled() && DEFAULT_FACES_CONFIG.equals(systemId))
- log.warn(DEFAULT_FACES_CONFIG + " has been specified in the " +
- FacesServlet.CONFIG_FILES_ATTR + " context parameter of " +
- "the deployment descriptor. This will automatically be removed, " +
- "if we wouldn't do this, it would be loaded twice. See JSF spec 1.1, 10.3.2");
+ if (DEFAULT_FACES_CONFIG.equals(systemId))
+ {
+ if(log.isWarnEnabled())
+ log.warn(DEFAULT_FACES_CONFIG + " has been specified in the " +
+ FacesServlet.CONFIG_FILES_ATTR + " context parameter of " +
+ "the deployment descriptor. This will automatically be removed, " +
+ "if we wouldn't do this, it would be loaded twice. See JSF spec 1.1, 10.3.2");
+ }
else
configFilesList.add(systemId);
}