From 4d1d60ac429e0ec2d83c2e1e33107773d51e375c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 8 Sep 2020 16:50:40 +0200 Subject: [PATCH 1/2] Check log level before delegating Supplier-based message to target Log Closes gh-25741 --- .../springframework/core/log/LogAccessor.java | 50 ++++++++++++++----- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/log/LogAccessor.java b/spring-core/src/main/java/org/springframework/core/log/LogAccessor.java index b38223091ae..1ad7701e880 100644 --- a/spring-core/src/main/java/org/springframework/core/log/LogAccessor.java +++ b/spring-core/src/main/java/org/springframework/core/log/LogAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -225,7 +225,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void fatal(Supplier messageSupplier) { - this.log.fatal(LogMessage.of(messageSupplier)); + if (this.log.isFatalEnabled()) { + this.log.fatal(LogMessage.of(messageSupplier)); + } } /** @@ -234,7 +236,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void fatal(Throwable cause, Supplier messageSupplier) { - this.log.fatal(LogMessage.of(messageSupplier), cause); + if (this.log.isFatalEnabled()) { + this.log.fatal(LogMessage.of(messageSupplier), cause); + } } /** @@ -242,7 +246,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void error(Supplier messageSupplier) { - this.log.error(LogMessage.of(messageSupplier)); + if (this.log.isErrorEnabled()) { + this.log.error(LogMessage.of(messageSupplier)); + } } /** @@ -251,7 +257,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void error(Throwable cause, Supplier messageSupplier) { - this.log.error(LogMessage.of(messageSupplier), cause); + if (this.log.isErrorEnabled()) { + this.log.error(LogMessage.of(messageSupplier), cause); + } } /** @@ -259,7 +267,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void warn(Supplier messageSupplier) { - this.log.warn(LogMessage.of(messageSupplier)); + if (this.log.isWarnEnabled()) { + this.log.warn(LogMessage.of(messageSupplier)); + } } /** @@ -268,7 +278,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void warn(Throwable cause, Supplier messageSupplier) { - this.log.warn(LogMessage.of(messageSupplier), cause); + if (this.log.isWarnEnabled()) { + this.log.warn(LogMessage.of(messageSupplier), cause); + } } /** @@ -276,7 +288,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void info(Supplier messageSupplier) { - this.log.info(LogMessage.of(messageSupplier)); + if (this.log.isInfoEnabled()) { + this.log.info(LogMessage.of(messageSupplier)); + } } /** @@ -285,7 +299,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void info(Throwable cause, Supplier messageSupplier) { - this.log.info(LogMessage.of(messageSupplier), cause); + if (this.log.isInfoEnabled()) { + this.log.info(LogMessage.of(messageSupplier), cause); + } } /** @@ -293,7 +309,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void debug(Supplier messageSupplier) { - this.log.debug(LogMessage.of(messageSupplier)); + if (this.log.isDebugEnabled()) { + this.log.debug(LogMessage.of(messageSupplier)); + } } /** @@ -302,7 +320,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void debug(Throwable cause, Supplier messageSupplier) { - this.log.debug(LogMessage.of(messageSupplier), cause); + if (this.log.isDebugEnabled()) { + this.log.debug(LogMessage.of(messageSupplier), cause); + } } /** @@ -310,7 +330,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void trace(Supplier messageSupplier) { - this.log.trace(LogMessage.of(messageSupplier)); + if (this.log.isTraceEnabled()) { + this.log.trace(LogMessage.of(messageSupplier)); + } } /** @@ -319,7 +341,9 @@ public class LogAccessor { * @param messageSupplier a lazy supplier for the message to log */ public void trace(Throwable cause, Supplier messageSupplier) { - this.log.trace(LogMessage.of(messageSupplier), cause); + if (this.log.isTraceEnabled()) { + this.log.trace(LogMessage.of(messageSupplier), cause); + } } } From ed3b7cd10f0ae98a50e5711927bbb32c342cb3ef Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 8 Sep 2020 17:09:13 +0200 Subject: [PATCH 2/2] Upgrade to HSQLDB 2.5.1 and Woodstox 6.2.1 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f1d8032ca77..b26418f7005 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ configure(allprojects) { project -> dependency "com.caucho:hessian:4.0.63" dependency "com.fasterxml:aalto-xml:1.2.2" - dependency("com.fasterxml.woodstox:woodstox-core:6.1.1") { + dependency("com.fasterxml.woodstox:woodstox-core:6.2.1") { exclude group: "stax", name: "stax-api" } dependency "com.google.code.gson:gson:2.8.6" @@ -109,7 +109,7 @@ configure(allprojects) { project -> dependency "org.apache.poi:poi-ooxml:4.1.2" dependency "org.apache-extras.beanshell:bsh:2.0b6" dependency "org.freemarker:freemarker:2.3.30" - dependency "org.hsqldb:hsqldb:2.5.0" + dependency "org.hsqldb:hsqldb:2.5.1" dependency "org.quartz-scheduler:quartz:2.3.2" dependency "org.codehaus.fabric3.api:commonj:1.1.0" dependency "net.sf.ehcache:ehcache:2.10.6"