Author: echatellier Date: 2011-12-23 15:16:06 +0100 (Fri, 23 Dec 2011) New Revision: 926 Url: http://forge.codelutin.com/repositories/revision/coser/926 Log: Fix nullpointerexception in ApplicationConfig Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-12-22 16:26:22 UTC (rev 925) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2011-12-23 14:16:06 UTC (rev 926) @@ -85,6 +85,8 @@ /** Context name for multiple deployment. */ CONTEXT_NAME(APP_NAME, null, "coser"), + // see : http://www.nuiton.org/issues/1862 + ENCODING_HACK(CONTEXT_NAME.getDefaultValue() + "." + CONFIG_ENCODING, null, "UTF-8"), CONFIG_FILE(CONTEXT_NAME.defaultValue + "." + CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), APPLICATION_VERSION("coser.application.version", _("coser.config.application.version.description"), null), ADMIN_EMAIL("coser.admin.email", _("coser.config.config.file.description"), "harmonie@ifremer.fr"),