From 5d7fb1a1c2e4925d23a6e4aed37362a174184154 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 16 Aug 2018 12:08:26 +0200 Subject: [PATCH] Polishing --- spring-beans/spring-beans.gradle | 8 +++----- .../servlet/handler/AbstractHandlerExceptionResolver.java | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle index e60972f9ad..19272929ee 100644 --- a/spring-beans/spring-beans.gradle +++ b/spring-beans/spring-beans.gradle @@ -12,8 +12,7 @@ dependencies { testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") } -// This modules does joint compilation for Java and Groovy code, -// with the compileGroovy task. +// This module does joint compilation for Java and Groovy code with the compileGroovy task. sourceSets { main.groovy.srcDirs += "src/main/java" main.java.srcDirs = [] @@ -24,9 +23,8 @@ compileGroovy { targetCompatibility = 1.8 } -// This module also builds Kotlin code and the compileKotlin task -// naturally depends on compileJava. -// We need to redefine dependencies to break task cycles. +// This module also builds Kotlin code and the compileKotlin task naturally depends on +// compileJava. We need to redefine dependencies to break task cycles. def deps = compileGroovy.taskDependencies.immutableValues + compileGroovy.taskDependencies.mutableValues compileGroovy.dependsOn = deps - 'compileJava' compileKotlin.dependsOn(compileGroovy) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java index fb81ec9e23..d4f68f8a60 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java @@ -135,13 +135,11 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti prepareResponse(ex, response); ModelAndView result = doResolveException(request, response, handler, ex); if (result != null) { - - // Print warn message, when warn logger is not enabled.. + // Print warn message when warn logger is not enabled... if (logger.isWarnEnabled() && (this.warnLogger == null || !this.warnLogger.isWarnEnabled())) { logger.warn("Resolved [" + ex + "]" + (result.isEmpty() ? "" : " to " + result)); } - - // warnLogger with full stack trace (requires explicit config).. + // warnLogger with full stack trace (requires explicit config) logException(ex, request); } return result;