From 069a1256c6ebdc1142e525a44733bc32fd834061 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 04 Aug 2026 11:37:29 +0000
Subject: [PATCH] Fix CodeQL note-severity alerts: ignored error status of file and stream calls (#814)
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
index e7d6212..f15ec37 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
@@ -13,6 +13,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
*/
package org.opends.quicksetup;
@@ -22,7 +23,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.file.Files;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.ServerConstants;
@@ -33,6 +37,8 @@
*/
public class LicenseFile
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private static final String INSTALL_ROOT_SYSTEM_PROPERTY = "INSTALL_ROOT";
/** The license file name in Legal directory. */
private static final String LICENSE_FILE_NAME = "Forgerock_License.txt";
@@ -61,9 +67,9 @@
String instanceLegalDirName = Utils.getInstancePathFromInstallPath(getInstallDirectory())
+ File.separator + LEGAL_FOLDER_NAME;
File instanceLegalDir = new File(instanceLegalDirName);
- if (!instanceLegalDir.exists())
+ if (!instanceLegalDir.isDirectory() && !instanceLegalDir.mkdirs())
{
- instanceLegalDir.mkdir();
+ logger.warn(LocalizableMessage.raw("Unable to create the legal directory %s", instanceLegalDirName));
}
return instanceLegalDirName;
}
@@ -164,17 +170,19 @@
String instanceLegalDirName = instanceDirname + File.separator + LEGAL_FOLDER_NAME;
File instanceLegalDir = new File(instanceLegalDirName);
+ File approvalFile = new File(instanceLegalDir, ACCEPTED_LICENSE_FILE_NAME);
try
{
- if (!instanceLegalDir.exists())
+ Files.createDirectories(instanceLegalDir.toPath());
+ if (!approvalFile.createNewFile() && !approvalFile.isFile())
{
- instanceLegalDir.mkdir();
+ logger.warn(LocalizableMessage.raw("Unable to create the license approval file %s", approvalFile));
}
- new File(instanceLegalDir, ACCEPTED_LICENSE_FILE_NAME).createNewFile();
}
catch (IOException e)
{
- // do nothing
+ logger.warn(LocalizableMessage.raw(
+ "Unable to create the license approval file %s: %s", approvalFile, e.getLocalizedMessage()));
}
}
}
--
Gitblit v1.10.0