/*
 * JBoss, Home of Professional Open Source.
 * Copyright 2014 Red Hat, Inc., and individual contributors
 * as indicated by the @author tags.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */

package io.undertow.util;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;

/**
 * @author Stuart Douglas
 */
public class LocaleUtils {

    public static Locale getLocaleFromString(String localeString) {
        if (localeString == null) {
            return null;
        }
        final String[] parts = localeString.split("-");
        if (parts.length == 1) {
            return new Locale(localeString, "");
        } else if (parts.length == 2) {
            return new Locale(parts[0], parts[1]);
        } else {
            return new Locale(parts[0], parts[1], parts[2]);
        }
    }

    public static List<Locale> getLocalesFromHeader(final String acceptLanguage) {
        return getLocalesFromHeader(Collections.singletonList(acceptLanguage));
    }

    public static List<Locale> getLocalesFromHeader(final List<String> acceptLanguage) {
        if (acceptLanguage == null || acceptLanguage.isEmpty()) {
            return Collections.singletonList(Locale.getDefault());
        }
        final List<Locale> ret = new ArrayList<>();
        final List<List<QValueParser.QValueResult>> parsedResults = QValueParser.parse(acceptLanguage);
        for (List<QValueParser.QValueResult> qvalueResult : parsedResults) {
            for (QValueParser.QValueResult res : qvalueResult) {
                if (!res.isQValueZero()) {
                    Locale e = LocaleUtils.getLocaleFromString(res.getValue());
                    ret.add(e);
                }
            }
        }
        return ret;
    }
}

@@ -844,16 +844,77 @@
 e;%0A%0A/**%0A
+ * Utility methods for getting the locale from a request.%0A *%0A
  * @auth
@@ -1434,173 +1434,858 @@
     
-public static List%3CLocale%3E getLocalesFromHeader(final String acceptLanguage) %7B%0A        return getLocalesFromHeader(Collections.singletonList(acceptLanguage));%0A    %7D%0A
+/**%0A     * Parse a header string and return the list of locales that were found.%0A     *%0A     * If the header is empty or null then an empty list will be returned.%0A     *%0A     * @param acceptLanguage The Accept-Language header%0A     * @return The list of locales, in order of preference%0A     */%0A    public static List%3CLocale%3E getLocalesFromHeader(final String acceptLanguage) %7B%0A        if(acceptLanguage == null) %7B%0A            return Collections.emptyList();%0A        %7D%0A        return getLocalesFromHeader(Collections.singletonList(acceptLanguage));%0A    %7D%0A%0A    /**%0A     * Parse a header string and return the list of locales that were found.%0A     *%0A     * If the header is empty or null then an empty list will be returned.%0A     *%0A     * @param acceptLanguage The Accept-Language header%0A     * @return The list of locales, in order of preference%0A     */
 %0A   
@@ -2471,41 +2471,18 @@
 ons.
-singletonList(Locale.getDefault()
+emptyList(
 );%0A 

Make sure LocaleUtils never returns the default locale, just an empty list