From 94f1d77e227f30cae32b262b8cd5c982631f4186 Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Tue, 26 May 2020 11:01:32 +0800
Subject: [PATCH] Polish StringHttpMessageConverter.getContentTypeCharset()

Closes gh-25126
---
 .../converter/StringHttpMessageConverter.java | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
index d576855d95..e5f3119482 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
@@ -139,18 +139,19 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
 	}
 
 	private Charset getContentTypeCharset(@Nullable MediaType contentType) {
-		if (contentType != null && contentType.getCharset() != null) {
-			return contentType.getCharset();
-		}
-		else if (contentType != null && contentType.isCompatibleWith(MediaType.APPLICATION_JSON)) {
-			// Matching to AbstractJackson2HttpMessageConverter#DEFAULT_CHARSET
-			return StandardCharsets.UTF_8;
-		}
-		else {
-			Charset charset = getDefaultCharset();
-			Assert.state(charset != null, "No default charset");
-			return charset;
+		if (contentType != null) {
+			Charset charset = contentType.getCharset();
+			if (charset != null) {
+				return charset;
+			}
+			else if (contentType.isCompatibleWith(MediaType.APPLICATION_JSON)) {
+				// Matching to AbstractJackson2HttpMessageConverter#DEFAULT_CHARSET
+				return StandardCharsets.UTF_8;
+			}
 		}
+		Charset charset = getDefaultCharset();
+		Assert.state(charset != null, "No default charset");
+		return charset;
 	}
 
 }