diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java index b2951ad58..efd1090b6 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java @@ -758,7 +758,12 @@ public class Dispatcher { locale = request.getLocale(); } } else { - locale = request.getLocale(); + try { + locale = request.getLocale(); + } catch (RuntimeException e) { + LOG.warn("Cannot get locale from Http Request, falling back to system default locale", e); + locale = Locale.getDefault(); + } } return locale; }