Fix bug for FeignException cannot get the correct charset (OpenFeign#…

…1325)
Linda-pan · Jan 18, 2021 · b8a6b65 · b8a6b65
1 parent 4cf1a54
commit b8a6b65
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/feign/FeignException.java b/core/src/main/java/feign/FeignException.java
@@ -450,11 +450,11 @@ private static String getResponseBodyPreview(byte[] body, Charset charset) {
     private static Charset getResponseCharset(Map<String, Collection<String>> headers) {
 
       Collection<String> strings = headers.get("content-type");
-      if (strings == null || strings.size() == 0) {
+      if (strings == null || strings.isEmpty()) {
         return null;
       }
 
-      Pattern pattern = Pattern.compile("charset=([^\\s])");
+      Pattern pattern = Pattern.compile(".*charset=([^\\s|^;]+).*");
       Matcher matcher = pattern.matcher(strings.iterator().next());
       if (!matcher.lookingAt()) {
         return null;