Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/freemarker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 35e569b524c966f72a99974a4159a1dfc145c9f2
Choose a base ref
..
head repository: apache/freemarker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9d13f8184b526057d3cd9d5ed3b6ef697a716796
Choose a head ref
Showing with 3 additions and 2 deletions.
  1. +3 −2 freemarker-core/src/main/java/freemarker/log/Logger.java
5 changes: 3 additions & 2 deletions freemarker-core/src/main/java/freemarker/log/Logger.java
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,8 @@
* backing implementation like {@code logback-classic}), then FreeMarker will use SLF4J directly instead of Log4j (since
* FreeMarker 2.3.22).
*
* NOTE; When running on GraalVM native image (system property 'org.graalvm.nativeimage.imagecode' set), some logger factory checks will be skipped.
* NOTE: When running on GraalVM native image (system property 'org.graalvm.nativeimage.imagecode' set), then
* FreeMarker 2.4 is anticipated and SLF4J / Apache Commons are auto-detected. Additionally, log4j-over-slf4j lookup is skipped.
*
* <p>
* If the auto detection sequence describet above doesn't give you the result that you want, see
@@ -210,7 +211,7 @@ private static boolean isAutoDetectedNG( int libraryEnum ) {
}

private static boolean isAutoDetected(int libraryEnum) {
// 2.4: Remove libraryEnum == LIBRARY_SLF4J || libraryEnum == LIBRARY_COMMONS (use only isAutoDetectedNG()=
// 2.4: Remove libraryEnum == LIBRARY_SLF4J || libraryEnum == LIBRARY_COMMONS (use isAutoDetectedNG())
return IS_GRAALVM_NATIVE ? isAutoDetectedNG(libraryEnum) : isAutoDetectedLegacy(libraryEnum);
}