This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 58798fcbc2b858b5cacf8f1acbf6204ec516498e Author: Piotr P. Karwasz <[email protected]> AuthorDate: Tue Nov 14 11:12:27 2023 +0100 Fix code review problems #1961 --- .../main/java/org/apache/logging/log4j/message/StructuredDataId.java | 1 + log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java index 5aa6330cd1..cf4c7b49d6 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java @@ -210,6 +210,7 @@ public class StructuredDataId implements StringBuilderFormattable { * @deprecated Use {@link StructuredDataId#makeId(String, String)} instead */ @Deprecated + @InlineMe(replacement = "this.makeId(defaultId, String.valueOf(anEnterpriseNumber))") public StructuredDataId makeId(final String defaultId, final int anEnterpriseNumber) { return makeId(defaultId, String.valueOf(anEnterpriseNumber)); } diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java index a8be1c1f4a..5c33dcff50 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java @@ -109,7 +109,8 @@ public final class Constants { } static int getMajorVersion(final String version) { - final String[] parts = version.split("-|\\.", -1); + // Split into `major.minor.rest` + final String[] parts = version.split("-|\\.", 3); boolean isJEP223; try { final int token = Integer.parseInt(parts[0]);
