You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2021/06/01 19:05:19 UTC
[logging-log4j2] branch master updated: Use Math.max() or
Math.min() instead of doing it manually (#500)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new e395e13 Use Math.max() or Math.min() instead of doing it manually (#500)
e395e13 is described below
commit e395e13c513e17cb91781808f83b20ee559bf534
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Tue Jun 1 21:05:11 2021 +0200
Use Math.max() or Math.min() instead of doing it manually (#500)
---
.../src/main/java/org/apache/logging/log4j/core/tools/Generate.java | 2 +-
.../src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
index 0fca21e..6234859 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java
@@ -1089,7 +1089,7 @@ public final class Generate {
static String generateSource(final String classNameFQN, final List<LevelInfo> levels, final Type type) {
final StringBuilder sb = new StringBuilder(10000 * levels.size());
final int lastDot = classNameFQN.lastIndexOf('.');
- final String pkg = classNameFQN.substring(0, lastDot >= 0 ? lastDot : 0);
+ final String pkg = classNameFQN.substring(0, Math.max(lastDot, 0));
if (!pkg.isEmpty()) {
sb.append(String.format(PACKAGE_DECLARATION, pkg));
}
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java
index cf1d9d3..3d6e966 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java
@@ -79,7 +79,7 @@ public final class UuidUtil {
mac = new byte[6];
randomGenerator.nextBytes(mac);
}
- final int length = mac.length >= 6 ? 6 : mac.length;
+ final int length = Math.min(mac.length, 6);
final int index = mac.length >= 6 ? mac.length - 6 : 0;
final byte[] node = new byte[NODE_SIZE];
node[0] = VARIANT;