From 14f94c13789b8ace4eae258b5f1d64494518f9c3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 14:04:12 +0000
Subject: [PATCH] Remove null checks on returned values of Entry.get*Attribute*() methods.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index d755361..5285625 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -399,7 +399,7 @@
AttributeType t =
DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_DIRECTORY_PATH);
List<Attribute> attrList = backupDirEntry.getAttribute(t);
- if (attrList != null && !attrList.isEmpty())
+ if (!attrList.isEmpty())
{
for (ByteString v : attrList.get(0))
{
@@ -851,58 +851,51 @@
private void returnEntries(SearchOperation searchOperation, DN baseDN, SearchFilter filter, List<Attribute> attrList)
{
- if (attrList != null && !attrList.isEmpty())
+ for (ByteString v : attrList.get(0))
{
- for (ByteString v : attrList.get(0))
+ try
{
- try
- {
- File dir = new File(v.toString());
- BackupDirectory backupDirectory = backupDirectories.get(dir).getBackupDirectory();
- AttributeType idType = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_ID);
+ File dir = new File(v.toString());
+ BackupDirectory backupDirectory = backupDirectories.get(dir).getBackupDirectory();
+ AttributeType idType = DirectoryServer.getAttributeTypeOrDefault(ATTR_BACKUP_ID);
- for (String backupID : backupDirectory.getBackups().keySet())
+ for (String backupID : backupDirectory.getBackups().keySet())
+ {
+ DN backupEntryDN = makeChildDN(baseDN, idType, backupID);
+ Entry backupEntry = getBackupEntry(backupEntryDN);
+ if (filter.matchesEntry(backupEntry))
{
- DN backupEntryDN = makeChildDN(baseDN, idType, backupID);
- Entry backupEntry = getBackupEntry(backupEntryDN);
- if (filter.matchesEntry(backupEntry))
- {
- searchOperation.returnEntry(backupEntry, null);
- }
+ searchOperation.returnEntry(backupEntry, null);
}
}
- catch (Exception e)
- {
- logger.traceException(e);
+ }
+ catch (Exception e)
+ {
+ logger.traceException(e);
- continue;
- }
+ continue;
}
}
}
- /** {@inheritDoc} */
@Override
public Set<String> getSupportedControls()
{
return Collections.emptySet();
}
- /** {@inheritDoc} */
@Override
public Set<String> getSupportedFeatures()
{
return Collections.emptySet();
}
- /** {@inheritDoc} */
@Override
public boolean supports(BackendOperation backendOperation)
{
return false;
}
- /** {@inheritDoc} */
@Override
public void exportLDIF(LDIFExportConfig exportConfig)
throws DirectoryException
--
Gitblit v1.10.0