root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1650 from izeye:polish-20180124 

* pr/1650:
  Polish "Remove an unnecessary intermediate variable"
  Remove an unnecessary intermediate variable
This commit is contained in:
Stephane Nicoll 2018-01-24 09:19:15 +01:00
parent 1af052433c 42a2081e8c
commit 6db1b692b8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -327,20 +327,19 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
protected String getMessagePayload(HttpServletRequest request) { protected String getMessagePayload(HttpServletRequest request) {
ContentCachingRequestWrapper wrapper = ContentCachingRequestWrapper wrapper =
WebUtils.getNativeRequest(request, ContentCachingRequestWrapper.class); WebUtils.getNativeRequest(request, ContentCachingRequestWrapper.class);
String payload = null;
if (wrapper != null) { if (wrapper != null) {
byte[] buf = wrapper.getContentAsByteArray(); byte[] buf = wrapper.getContentAsByteArray();
if (buf.length > 0) { if (buf.length > 0) {
int length = Math.min(buf.length, getMaxPayloadLength()); int length = Math.min(buf.length, getMaxPayloadLength());
try { try {
payload = new String(buf, 0, length, wrapper.getCharacterEncoding()); return new String(buf, 0, length, wrapper.getCharacterEncoding());
} }
catch (UnsupportedEncodingException ex) { catch (UnsupportedEncodingException ex) {
payload = "[unknown]"; return "[unknown]";
} }
} }
} }
return payload; return null;
} }