Fix issue 1516: encode-password with --encodedPasswordFile doesn't work.

coulbeck

26.37.2007 2ee035bf164fe1976b7c51b0f248322ae6dcb33e

 opends/src/server/org/opends/server/tools/EncodePassword.java

@@ -319,7 +319,8 @@
        return 1;
      }

      if ((! encodedPassword.isPresent()) && (! schemeName.isPresent()))
      if ((! encodedPassword.isPresent()) && (! encodedPasswordFile.isPresent())
           && (! schemeName.isPresent()))
      {
        int    msgID   = MSGID_ENCPW_NO_SCHEME;
        String message = getMessage(msgID, schemeName.getLongIdentifier());
@@ -339,6 +340,11 @@
      compareMode = true;
      encodedPW = new ASN1OctetString(encodedPassword.getValue());
    }
    else if (encodedPasswordFile.hasValue())
    {
      compareMode = true;
      encodedPW = new ASN1OctetString(encodedPasswordFile.getValue());
    }
    else
    {
      compareMode = false;