From fc11cb328f23d141ecfedd16d791e39fd4e1d299 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 18 Sep 2012 07:58:15 +0000
Subject: [PATCH] Fix OPENDJ-595: Merge ASN1Constants into ASN1
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
index 36fa325..d46ae43 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/AbstractASN1Reader.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.forgerock.opendj.asn1;
-import static org.forgerock.opendj.asn1.ASN1Constants.*;
import static org.forgerock.opendj.ldap.CoreMessages.ERR_ASN1_UNEXPECTED_TAG;
import java.io.IOException;
@@ -53,7 +53,7 @@
*/
public boolean readBoolean(byte type) throws IOException {
if (type == 0x00) {
- type = UNIVERSAL_BOOLEAN_TYPE;
+ type = ASN1.UNIVERSAL_BOOLEAN_TYPE;
}
checkType(type);
return readBoolean();
@@ -64,7 +64,7 @@
*/
public int readEnumerated(byte type) throws IOException {
if (type == 0x00) {
- type = UNIVERSAL_ENUMERATED_TYPE;
+ type = ASN1.UNIVERSAL_ENUMERATED_TYPE;
}
checkType(type);
return readEnumerated();
@@ -75,7 +75,7 @@
*/
public long readInteger(byte type) throws IOException {
if (type == 0x00) {
- type = UNIVERSAL_INTEGER_TYPE;
+ type = ASN1.UNIVERSAL_INTEGER_TYPE;
}
checkType(type);
return readInteger();
@@ -86,7 +86,7 @@
*/
public void readNull(byte type) throws IOException {
if (type == 0x00) {
- type = UNIVERSAL_NULL_TYPE;
+ type = ASN1.UNIVERSAL_NULL_TYPE;
}
checkType(type);
readNull();
@@ -97,7 +97,7 @@
*/
public ByteString readOctetString(byte type) throws IOException {
if (type == 0x00) {
- type = UNIVERSAL_OCTET_STRING_TYPE;
+ type = ASN1.UNIVERSAL_OCTET_STRING_TYPE;
}
checkType(type);
return readOctetString();
@@ -109,7 +109,7 @@
public ByteStringBuilder readOctetString(byte type, final ByteStringBuilder builder)
throws IOException {
if (type == 0x00) {
- type = UNIVERSAL_OCTET_STRING_TYPE;
+ type = ASN1.UNIVERSAL_OCTET_STRING_TYPE;
}
checkType(type);
readOctetString(builder);
@@ -123,7 +123,7 @@
// We could cache the UTF-8 CharSet if performance proves to be an
// issue.
if (type == 0x00) {
- type = UNIVERSAL_OCTET_STRING_TYPE;
+ type = ASN1.UNIVERSAL_OCTET_STRING_TYPE;
}
checkType(type);
return readOctetStringAsString();
@@ -134,7 +134,7 @@
*/
public void readStartSequence(byte type) throws IOException {
if (type == 0x00) {
- type = UNIVERSAL_SEQUENCE_TYPE;
+ type = ASN1.UNIVERSAL_SEQUENCE_TYPE;
}
checkType(type);
readStartSequence();
@@ -147,7 +147,7 @@
// From an implementation point of view, a set is equivalent to a
// sequence.
if (type == 0x00) {
- type = UNIVERSAL_SET_TYPE;
+ type = ASN1.UNIVERSAL_SET_TYPE;
}
checkType(type);
readStartSet();
--
Gitblit v1.10.0