Code cleanups: - remove isEmpty() checks when lists are iterated immediatel...

Jean-Noël Rouvignac

02.47.2016 cdbc97a66ca18d9f74b58c3fbca253f17d4dcd55

 opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java

@@ -36,13 +36,13 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.internal.Requests;
import org.opends.server.protocols.internal.SearchRequest;
import org.opends.server.types.Attribute;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.Attributes;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;
@@ -250,20 +250,19 @@
    }

    // Read the port from the PORT attribute
    SearchResultEntry adminConnectorEntry = null;
    LinkedList<SearchResultEntry> result = search.getSearchEntries();
    if (!result.isEmpty())
    {
      adminConnectorEntry = result.getFirst();
      SearchResultEntry adminConnectorEntry = result.getFirst();
      AttributeType attrType = DirectoryServer.getAttributeType(attrName);
      List<Attribute> attrs = adminConnectorEntry.getAttribute(attrType);
      if (!attrs.isEmpty())
      {
        // Get the attribute value
        return attrs.get(0).iterator().next().toString();
      }
    }

    AttributeType attrType = DirectoryServer.getAttributeType(attrName);
    List<Attribute> attrs = adminConnectorEntry.getAttribute(attrType);
    if (!attrs.isEmpty())
    {
      // Get the attribute value
      return attrs.get(0).iterator().next().toString();
    }
    // Can not happen. Best effort.
    // TODO Log an Error.
    return null;