From df59285898b635c3c9f3011609eb7a73e779ecb9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 10:10:50 +0000
Subject: [PATCH] OPENDJ-1307 Migrate server ASN1 classes to SDK
---
opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 57f1537..869be4d 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -69,7 +69,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1Exception;
+import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.protocols.ldap.LDAPConstants;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.protocols.ldap.LDAPMessage;
@@ -300,11 +300,10 @@
LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null, le);
}
- catch (ASN1Exception ae)
+ catch (DecodeException ae)
{
LocalizableMessage m = INFO_RESULT_CLIENT_SIDE_ENCODING_ERROR.get();
- throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null,
- ae);
+ throw new LDAPConnectionException(m, CLIENT_SIDE_CONNECT_ERROR, null, ae);
}
catch (IOException ie)
{
@@ -621,7 +620,7 @@
* @return a JAXBElement that contains an ErrorResponse
*/
private JAXBElement<ErrorResponse> createErrorResponse(Throwable t) {
- // potential exceptions are IOException, LDAPException, ASN1Exception
+ // potential exceptions are IOException, LDAPException, DecodeException
ErrorResponse errorResponse = objFactory.createErrorResponse();
errorResponse.setMessage(String.valueOf(t));
--
Gitblit v1.10.0