From 826db885093360e8dd27f3ef566c392af1e01aa9 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Wed, 24 Jan 2018 11:09:35 +0900
Subject: [PATCH] Remove an unnecessary intermediate variable

See gh-1650
---
 .../web/filter/AbstractRequestLoggingFilter.java           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
index 77ac918940..3d1198e603 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
@@ -327,20 +327,19 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 	protected String getMessagePayload(HttpServletRequest request) {
 		ContentCachingRequestWrapper wrapper =
 				WebUtils.getNativeRequest(request, ContentCachingRequestWrapper.class);
-		String payload = null;
 		if (wrapper != null) {
 			byte[] buf = wrapper.getContentAsByteArray();
 			if (buf.length > 0) {
 				int length = Math.min(buf.length, getMaxPayloadLength());
 				try {
-					payload = new String(buf, 0, length, wrapper.getCharacterEncoding());
+					return new String(buf, 0, length, wrapper.getCharacterEncoding());
 				}
 				catch (UnsupportedEncodingException ex) {
-					payload = "[unknown]";
+					return "[unknown]";
 				}
 			}
 		}
-		return payload;
+		return null;
 	}