From 08a8540072a370b4e7e9604eb97818dcfd4d74c6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2773 Remove duplicated server tools
---
opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLServlet.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLServlet.java b/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLServlet.java
index b00def0..dd2fee7 100644
--- a/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj-dsml-servlet/src/main/java/org/opends/dsml/protocol/DSMLServlet.java
@@ -31,7 +31,6 @@
import java.io.OutputStream;
import java.io.StringReader;
import java.net.URL;
-import java.text.ParseException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
@@ -72,6 +71,8 @@
import javax.xml.validation.SchemaFactory;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizedIllegalArgumentException;
+import org.forgerock.opendj.ldap.Base64;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.forgerock.opendj.ldap.SearchScope;
@@ -89,7 +90,6 @@
import org.opends.server.tools.SSLConnectionException;
import org.opends.server.tools.SSLConnectionFactory;
import org.opends.server.types.LDAPException;
-import org.opends.server.util.Base64;
import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
@@ -379,7 +379,7 @@
authenticationInHeader = true;
String authorization = headerVal.substring(6).trim();
try {
- String unencoded = new String(Base64.decode(authorization));
+ String unencoded = new String(Base64.decode(authorization).toByteArray());
int colon = unencoded.indexOf(':');
if (colon > 0) {
if (useHTTPAuthzID)
@@ -395,7 +395,7 @@
}
bindPassword = unencoded.substring(colon + 1);
}
- } catch (ParseException ex) {
+ } catch (final LocalizedIllegalArgumentException ex) {
// user/DN:password parsing error
batchResponses.add(
createErrorResponse(objFactory,
--
Gitblit v1.10.0