Author: markt Date: Wed Jul 3 10:48:14 2013 New Revision: 1499314 URL: http://svn.apache.org/r1499314 Log: Make context optional when looking up messages
Modified: tomcat/trunk/java/javax/el/ELResolver.java Modified: tomcat/trunk/java/javax/el/ELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELResolver.java?rev=1499314&r1=1499313&r2=1499314&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ELResolver.java (original) +++ tomcat/trunk/java/javax/el/ELResolver.java Wed Jul 3 10:48:14 2013 @@ -30,7 +30,10 @@ import java.util.ResourceBundle; public abstract class ELResolver { static String message(ELContext context, String name, Object[] props) { - Locale locale = context.getLocale(); + Locale locale = null; + if (context != null) { + locale = context.getLocale(); + } if (locale == null) { locale = Locale.getDefault(); if (locale == null) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org