From 504a43fc479d884085df9895900608dc5b0aca6f Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Fri, 31 Jul 2026 07:52:35 +0000
Subject: [PATCH] Fix CodeQL warning-severity alerts: dead checks, boxed locals and three null dereferences (#793)
---
opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index 5e344e8..e4d8c8e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -511,11 +511,7 @@
int firstByte = 0xFF & a[i];
int secondByte = 0xFF & a2[i];
if (firstByte != secondByte) {
- if (firstByte < secondByte) {
- return -1;
- } else if (firstByte > secondByte) {
- return 1;
- }
+ return firstByte < secondByte ? -1 : 1;
}
}
@@ -1795,7 +1791,10 @@
}
}
- return successful & file.delete();
+ // The delete must be attempted even when a child could not be removed, so it is
+ // evaluated into a local before being combined with the running result.
+ final boolean deleted = file.delete();
+ return successful && deleted;
}
return false;
}
--
Gitblit v1.10.0