You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2007/03/11 22:11:17 UTC
svn commit: r517013 -
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Author: dennisbyrne
Date: Sun Mar 11 14:11:15 2007
New Revision: 517013
URL: http://svn.apache.org/viewvc?view=rev&rev=517013
Log:
MYFACES-1557, patch for thread safety by David Jencks
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?view=diff&rev=517013&r1=517012&r2=517013
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Sun Mar 11 14:11:15 2007
@@ -135,10 +135,20 @@
{
MyfacesConfig myfacesConfig = (MyfacesConfig)extCtx
.getApplicationMap().get(APPLICATION_MAP_PARAM_NAME);
- if (myfacesConfig != null) return myfacesConfig;
+ if (myfacesConfig == null)
+ {
+
+ myfacesConfig = createAndInitializeMyFacesConfig(extCtx);
+
+ extCtx.getApplicationMap().put(APPLICATION_MAP_PARAM_NAME, myfacesConfig);
+
+ }
- myfacesConfig = new MyfacesConfig();
- extCtx.getApplicationMap().put(APPLICATION_MAP_PARAM_NAME, myfacesConfig);
+ return myfacesConfig;
+ }
+
+ private static MyfacesConfig createAndInitializeMyFacesConfig(ExternalContext extCtx) {
+ MyfacesConfig myfacesConfig = new MyfacesConfig();
myfacesConfig.setPrettyHtml(getBooleanInitParameter(extCtx, INIT_PARAM_PRETTY_HTML,
INIT_PARAM_PRETTY_HTML_DEFAULT));
@@ -190,9 +200,8 @@
{
log.error("Both MyFaces and the RI are on your classpath. Please make sure to use only one of the two JSF-implementations.");
}
-
- return myfacesConfig;
- }
+ return myfacesConfig;
+ }
private static boolean getBooleanInitParameter(ExternalContext externalContext,
String paramName,