From 1ef65104c4113a1c6fad7ee93bc9862218a4bc68 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Feb 2015 14:10:23 +0000
Subject: [PATCH] AutoRefactor: common code in if else statements
---
opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
index ddfbc82..bb404a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java
@@ -272,7 +272,7 @@
//Return objectclass attribute unless analysis of the arguments determines
//otherwise.
boolean includeObjectclassAttrs = true;
- LinkedList<String> attributeNames;
+ final LinkedList<String> attributeNames = new LinkedList<String>();
LinkedList<String> objectClassNames = new LinkedList<String>();
LinkedList<String> filterStrings = new LinkedList<String>();
if (filterFile.isPresent())
@@ -304,13 +304,8 @@
}
ArrayList<String> trailingArguments = argParser.getTrailingArguments();
- if ((trailingArguments == null) || trailingArguments.isEmpty())
+ if (trailingArguments != null && !trailingArguments.isEmpty())
{
- attributeNames = new LinkedList<String>();
- }
- else
- {
- attributeNames = new LinkedList<String>();
for (String attributeName : trailingArguments)
{
String lowerName = toLowerCase(attributeName);
@@ -349,7 +344,6 @@
filterStrings = new LinkedList<String>();
filterStrings.add(iterator.next());
- attributeNames = new LinkedList<String>();
while (iterator.hasNext())
{
String lowerName = toLowerCase(iterator.next());
@@ -373,8 +367,9 @@
}
}
- if (attributeNames.isEmpty() && objectClassNames.isEmpty() &&
- (! allOperationalAttrs))
+ if (attributeNames.isEmpty()
+ && objectClassNames.isEmpty()
+ && !allOperationalAttrs)
{
// This will be true if no attributes were requested, which is effectively
// all user attributes. It will also be true if just "*" was included,
@@ -389,7 +384,7 @@
attributeNames.isEmpty())
includeObjectclassAttrs=false;
//If "objectclass" isn't specified in the attributes to return, then
- //don't include objectclass attribiute.
+ //don't include objectclass attribute.
if(!attributeNames.isEmpty() && objectClassNames.isEmpty() &&
!attributeNames.contains("objectclass"))
includeObjectclassAttrs=false;
--
Gitblit v1.10.0