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 1/2] 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 77ac9189404..3d1198e603d 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;
 	}
 
 

From 42a2081e8c4b3e63ba6295bfdc731353857e66d4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 24 Jan 2018 09:18:46 +0100
Subject: [PATCH 2/2] Polish "Remove an unnecessary intermediate variable"

Closes gh-1650
---
 .../web/filter/AbstractRequestLoggingFilter.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3d1198e603d..0fa8678b81e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.