From a401798e5e8f3142b49858c958bfcb9d4a764ddb Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 04 Sep 2012 16:29:01 +0000
Subject: [PATCH] Fix OPENDJ-369: Consider exposing base 64 encode/decode APIs
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
index 27c4178..0b6caf2 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java
@@ -55,7 +55,6 @@
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.ldap.schema.UnknownSchemaElementException;
-import com.forgerock.opendj.util.Base64;
import com.forgerock.opendj.util.Validator;
/**
@@ -258,7 +257,7 @@
}
try {
- value = Base64.decode(ldifLine.substring(pos));
+ value = ByteString.valueOfBase64(ldifLine.substring(pos));
} catch (final LocalizedIllegalArgumentException e) {
// The value did not have a valid base64-encoding.
final LocalizableMessage message =
@@ -608,7 +607,7 @@
final String base64DN = ldifLine.substring(pos);
try {
- dnString = Base64.decode(base64DN).toString();
+ dnString = ByteString.valueOfBase64(base64DN).toString();
} catch (final LocalizedIllegalArgumentException e) {
// The value did not have a valid base64-encoding.
final LocalizableMessage message =
@@ -663,7 +662,7 @@
}
try {
- pair.value = Base64.decode(ldifLine.substring(pos)).toString();
+ pair.value = ByteString.valueOfBase64(ldifLine.substring(pos)).toString();
} catch (final LocalizedIllegalArgumentException e) {
pair.key = null;
return ldifLine;
--
Gitblit v1.10.0