From f791b827ec7ec745bfc50c295966fbdd82d35e2a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Mon, 30 Jul 2018 23:33:53 +0200
Subject: [PATCH] Correct 404 status code and refined resolution failure log
 message

---
 .../mvc/support/DefaultHandlerExceptionResolver.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index 652ddbeb96a..c7b735690e7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -124,7 +124,7 @@ import org.springframework.web.servlet.handler.AbstractHandlerExceptionResolver;
  * </tr>
  * <tr class="rowColor">
  * <td><p>NoHandlerFoundException</p></td>
- * <td><p>400 (SC_NOT_FOUND)</p></td>
+ * <td><p>404 (SC_NOT_FOUND)</p></td>
  * </tr>
  * <tr class="altColor">
  * <td><p>AsyncRequestTimeoutException</p></td>
@@ -228,9 +228,9 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
 						(AsyncRequestTimeoutException) ex, request, response, handler);
 			}
 		}
-		catch (Exception handlerException) {
+		catch (Exception handlerEx) {
 			if (logger.isWarnEnabled()) {
-				logger.warn("Handling of [" + ex.getClass().getName() + "] resulted in exception", handlerException);
+				logger.warn("Failure while trying to resolve exception [" + ex.getClass().getName() + "]", handlerEx);
 			}
 		}
 		return null;
@@ -463,7 +463,7 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
 	protected ModelAndView handleMethodArgumentNotValidException(MethodArgumentNotValidException ex,
 			HttpServletRequest request, HttpServletResponse response, @Nullable Object handler) throws IOException {
 
- 		response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+		response.sendError(HttpServletResponse.SC_BAD_REQUEST);
 		return new ModelAndView();
 	}