From 4baece95779dd46a3a59d59d1b7aa5958cf6117d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 05 Nov 2015 12:25:29 +0000
Subject: [PATCH] OPENDJ-1802 Make ByteString methods more intentional
---
opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
index 7d3cd75..28aec95 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java
@@ -336,12 +336,12 @@
if (encodedPassword.hasValue())
{
compareMode = true;
- encodedPW = ByteString.valueOf(encodedPassword.getValue());
+ encodedPW = ByteString.valueOfUtf8(encodedPassword.getValue());
}
else if (encodedPasswordFile.hasValue())
{
compareMode = true;
- encodedPW = ByteString.valueOf(encodedPasswordFile.getValue());
+ encodedPW = ByteString.valueOfUtf8(encodedPasswordFile.getValue());
}
else
{
@@ -577,7 +577,7 @@
}
boolean passwordMatches =
storageScheme.passwordMatches(clearPW, ByteString
- .valueOf(encodedPWString));
+ .valueOfUtf8(encodedPWString));
out.println(getOutputMessage(passwordMatches));
if (useCompareResultCode.isPresent())
{
@@ -823,11 +823,11 @@
{
if (clearPassword.hasValue())
{
- return ByteString.valueOf(clearPassword.getValue());
+ return ByteString.valueOfUtf8(clearPassword.getValue());
}
else if (clearPasswordFile.hasValue())
{
- return ByteString.valueOf(clearPasswordFile.getValue());
+ return ByteString.valueOfUtf8(clearPasswordFile.getValue());
}
else if (interactivePassword.isPresent())
{
@@ -838,7 +838,7 @@
String pwd2 = encodePassword.getPassword(INFO_ENCPW_INPUT_PWD_2.get().toString());
if (pwd1.equals(pwd2))
{
- return ByteString.valueOf(pwd1);
+ return ByteString.valueOfUtf8(pwd1);
}
else
{
--
Gitblit v1.10.0