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/server/org/opends/server/protocols/ldap/LDAPReader.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
index 0f1e7cc..08ffdd4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPReader.java
@@ -26,22 +26,20 @@
*/
package org.opends.server.protocols.ldap;
-import org.opends.server.protocols.asn1.ASN1Reader;
-import org.opends.server.protocols.asn1.ASN1Exception;
+import org.forgerock.opendj.io.ASN1;
+import org.forgerock.opendj.io.ASN1Reader;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.protocols.asn1.ASN1Constants.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
-
+import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.LinkedList;
-
/**
* Utility class used to decode LDAP messages from an ASN1Reader.
*/
@@ -742,9 +740,9 @@
}
}
}
- catch(ASN1Exception asn1e)
+ catch(IOException e)
{
- logger.traceException(asn1e);
+ logger.traceException(e);
}
try
@@ -1348,9 +1346,9 @@
}
}
}
- catch(ASN1Exception asn1e)
+ catch(IOException e)
{
- logger.traceException(asn1e);
+ logger.traceException(e);
}
try
@@ -1440,9 +1438,9 @@
}
}
}
- catch(ASN1Exception asn1e)
+ catch(IOException e)
{
- logger.traceException(asn1e);
+ logger.traceException(e);
}
try
@@ -2452,7 +2450,7 @@
try
{
if(reader.hasNextElement() &&
- reader.peekType() == UNIVERSAL_BOOLEAN_TYPE)
+ reader.peekType() == ASN1.UNIVERSAL_BOOLEAN_TYPE)
{
try
{
@@ -2467,7 +2465,7 @@
}
}
if(reader.hasNextElement() &&
- reader.peekType() == UNIVERSAL_OCTET_STRING_TYPE)
+ reader.peekType() == ASN1.UNIVERSAL_OCTET_STRING_TYPE)
{
try
{
@@ -2482,9 +2480,9 @@
}
}
}
- catch(ASN1Exception asn1e)
+ catch(IOException e)
{
- logger.traceException(asn1e);
+ logger.traceException(e);
}
try
--
Gitblit v1.10.0