This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 03e28ec7a82cb99946561032b82108b27eead65b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Jun 3 17:10:41 2014 +0200 check if accept-languages is not null for search best locale --- .../rest/api/PollenRestApiRequestFilter.java | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index 2ff0e34..a31f7c3 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -137,16 +137,19 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { log.info("Found Accept-Language: " + language); } - String[] allLanguage = language.split(","); - int i = 0; - do { - language = allLanguage[i].substring(0, 2); - if ( !language.equals("fr") && !language.equals("en") ) { - // language not accepted - language = null; - } - i++; - } while (language == null && i < allLanguage.length); + // search best locale accepted by the server 'fr' or 'en' + if (language != null) { + String[] allLanguage = language.split(","); + int i = 0; + do { + language = allLanguage[i].substring(0, 2); + if ( !language.equals("fr") && !language.equals("en") ) { + // language not accepted + language = null; + } + i++; + } while ( language == null && i < allLanguage.length ); + } if (language == null) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.