AutoRefactor: common code in if else statements

Jean-Noel Rouvignac

16.10.2015 1ef65104c4113a1c6fad7ee93bc9862218a4bc68

 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPDelete.java

@@ -41,7 +41,6 @@
import java.io.PrintStream;
import java.io.Reader;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.concurrent.atomic.AtomicInteger;

import org.forgerock.i18n.LocalizableMessage;
@@ -686,23 +685,14 @@
    connectionOptions.setSASLExternal(saslExternal.isPresent());
    if(saslOptions.isPresent())
    {
      LinkedList<String> values = saslOptions.getValues();
      for(String saslOption : values)
      for (String saslOption : saslOptions.getValues())
      {
        if(saslOption.startsWith("mech="))
        boolean val = saslOption.startsWith("mech=")
            ? connectionOptions.setSASLMechanism(saslOption)
            : connectionOptions.addSASLProperty(saslOption);
        if (!val)
        {
          boolean val = connectionOptions.setSASLMechanism(saslOption);
          if(val == false)
          {
            return CLIENT_SIDE_PARAM_ERROR;
          }
        } else
        {
          boolean val = connectionOptions.addSASLProperty(saslOption);
          if(val == false)
          {
            return CLIENT_SIDE_PARAM_ERROR;
          }
          return CLIENT_SIDE_PARAM_ERROR;
        }
      }
    }