Use Graal friendly logging factory implementations

Update `LoggingSystemFactory` class present checks to use a static final field so that they work better with Graal. Closes gh-23985
spring-projects · Nov 1, 2020 · fb59432 · fb59432
1 parent 298880c
commit fb59432
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...ct/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java b/...ct/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
@@ -187,9 +187,12 @@ public void run() {
 	@Order(Ordered.LOWEST_PRECEDENCE)
 	public static class Factory implements LoggingSystemFactory {
 
+		private static final boolean PRESENT = ClassUtils.isPresent("java.util.logging.LogManager",
+				Factory.class.getClassLoader());
+
 		@Override
 		public LoggingSystem getLoggingSystem(ClassLoader classLoader) {
-			if (ClassUtils.isPresent("java.util.logging.LogManager", classLoader)) {
+			if (PRESENT) {
 				return new JavaLoggingSystem(classLoader);
 			}
 			return null;

diff --git a/...pring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/...pring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
@@ -335,9 +335,12 @@ public void run() {
 	@Order(Ordered.LOWEST_PRECEDENCE)
 	public static class Factory implements LoggingSystemFactory {
 
+		private static final boolean PRESENT = ClassUtils
+				.isPresent("org.apache.logging.log4j.core.impl.Log4jContextFactory", Factory.class.getClassLoader());
+
 		@Override
 		public LoggingSystem getLoggingSystem(ClassLoader classLoader) {
-			if (ClassUtils.isPresent("org.apache.logging.log4j.core.impl.Log4jContextFactory", classLoader)) {
+			if (PRESENT) {
 				return new Log4J2LoggingSystem(classLoader);
 			}
 			return null;

diff --git a/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/...ing-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -339,9 +339,12 @@ public void run() {
 	@Order(Ordered.LOWEST_PRECEDENCE)
 	public static class Factory implements LoggingSystemFactory {
 
+		private static final boolean PRESENT = ClassUtils.isPresent("ch.qos.logback.core.Appender",
+				Factory.class.getClassLoader());
+
 		@Override
 		public LoggingSystem getLoggingSystem(ClassLoader classLoader) {
-			if (ClassUtils.isPresent("ch.qos.logback.core.Appender", classLoader)) {
+			if (PRESENT) {
 				return new LogbackLoggingSystem(classLoader);
 			}
 			return null;