From 1cba5b9488b36d9fb2e813f84ca3409b3bbdb0ef Mon Sep 17 00:00:00 2001 From: Valery Kharseko Date: Sat, 13 Jun 2026 17:18:29 +0300 Subject: [PATCH] Refactor file deletion logic to combine null check and length check. FIX Error occurred while enforcing retention policy Free Number Retention Policy cn=File Count Retention Policy,cn=Log Retention Policies,cn=config for logger cn=Replication Repair Logger,cn=Loggers,cn=config: DirectoryException: Error occurred while listing log files named by policy with initial file name (FileNumberRetentionPolicy.java:81 MultifileTextWriter.java:413) --- .../opends/server/loggers/FileNumberRetentionPolicy.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java index ff681c4d1e..bc95330500 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java @@ -13,6 +13,7 @@ * * Copyright 2006-2008 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC */ package org.opends.server.loggers; import static org.opends.messages.LoggerMessages.*; @@ -75,13 +76,8 @@ public File[] deleteFiles(FileNamingPolicy fileNamingPolicy) throws DirectoryException { File[] files = fileNamingPolicy.listFiles(); - if(files == null) - { - throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), - ERR_LOGGER_ERROR_LISTING_FILES.get(fileNamingPolicy.getInitialName())); - } - if (files.length <= numFiles) + if (files == null || files.length <= numFiles) { return new File[0]; }