Skip to content

Refactor file deletion logic to combine null check and length check. #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vharseko wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −6
Open

Refactor file deletion logic to combine null check and length check. #653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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];
}
Expand Down
Loading