From 28bc351e31d396face13a84edaf0d8ecb8d237e2 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 11 May 2020 14:55:35 +0200
Subject: [PATCH] Fixes a problem with missing locale if
 HttpServletRequest#getLocale throws exception

---
 .../java/org/apache/struts2/dispatcher/Dispatcher.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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;
     }