*** standard/src/org/apache/taglibs/standard/tag/common/core/Util.java 2006-04-02 16:12:11.000000000 +0800 --- Util.java.new 2006-04-03 12:11:59.000000000 +0800 *************** *** 278,283 **** --- 278,286 ---- */ public static Enumeration getRequestLocales(HttpServletRequest request) { Enumeration values = request.getHeaders("accept-language"); + if(values == null){ + return request.getLocales(); + } if (values.hasMoreElements()) { // At least one "accept-language". Simply return // the enumeration returned by request.getLocales().