This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 0bf3ae517fdea41ef5f9a10d628b78464ae2639b Author: ulrichenslin <[email protected]> AuthorDate: Fri Mar 1 18:24:22 2019 +0200 JEP223 detection --- .../apache/logging/log4j/core/layout/AbstractStringLayout.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java index d8403b6..deea87f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java @@ -134,7 +134,13 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> implem final String version = System.getProperty("java.version"); final String[] parts = version.split("\\."); try { - final int major = Integer.parseInt(parts[1]); + int major = Integer.parseInt(parts[1]); + + final int token = Integer.parseInt(parts[0]); + boolean isJEP223 = token != 1; + if (isJEP223) { + major = token; + } return major < 8; } catch (final Exception ex) { return true;
