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/ASN1ByteSequenceReader.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
index 6eeb6bd..0592ff8 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1ByteSequenceReader.java
@@ -27,9 +27,6 @@
package org.forgerock.opendj.asn1;
-import static org.forgerock.opendj.asn1.ASN1Constants.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
-import static org.forgerock.opendj.asn1.ASN1Constants.ELEMENT_READ_STATE_NEED_TYPE;
-import static org.forgerock.opendj.asn1.ASN1Constants.ELEMENT_READ_STATE_NEED_VALUE_BYTES;
import static org.forgerock.opendj.ldap.CoreMessages.*;
import java.io.IOException;
@@ -49,7 +46,7 @@
*/
final class ASN1ByteSequenceReader extends AbstractASN1Reader implements ASN1Reader {
- private int state = ELEMENT_READ_STATE_NEED_TYPE;
+ private int state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
private byte peekType = 0;
@@ -88,10 +85,10 @@
* {@inheritDoc}
*/
public boolean elementAvailable() throws IOException {
- if ((state == ELEMENT_READ_STATE_NEED_TYPE) && !needTypeState(false)) {
+ if ((state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) && !needTypeState(false)) {
return false;
}
- if ((state == ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE)
+ if ((state == ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE)
&& !needFirstLengthByteState(false)) {
return false;
}
@@ -103,7 +100,7 @@
* {@inheritDoc}
*/
public boolean hasNextElement() throws IOException {
- return (state != ELEMENT_READ_STATE_NEED_TYPE) || needTypeState(false);
+ return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE) || needTypeState(false);
}
/**
@@ -112,7 +109,7 @@
public int peekLength() throws IOException {
peekType();
- if (state == ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE) {
+ if (state == ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE) {
needFirstLengthByteState(true);
}
@@ -123,7 +120,7 @@
* {@inheritDoc}
*/
public byte peekType() throws IOException {
- if (state == ELEMENT_READ_STATE_NEED_TYPE) {
+ if (state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) {
// Read just the type.
if (reader.remaining() <= 0) {
final LocalizableMessage message = ERR_ASN1_TRUCATED_TYPE_BYTE.get();
@@ -132,7 +129,7 @@
final int type = reader.get();
peekType = (byte) type;
- state = ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
}
return peekType;
@@ -156,7 +153,7 @@
}
final int readByte = reader.get();
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return readByte != 0x00;
}
@@ -177,7 +174,7 @@
reader = readerStack.removeFirst();
// Reset the state
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
}
/**
@@ -232,7 +229,7 @@
longValue = (longValue << 8) | (readByte & 0xFF);
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return longValue;
} else {
int intValue = 0;
@@ -244,7 +241,7 @@
intValue = (intValue << 8) | (readByte & 0xFF);
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return intValue;
}
}
@@ -262,7 +259,7 @@
throw DecodeException.fatalError(message);
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
}
/**
@@ -278,7 +275,7 @@
throw DecodeException.fatalError(message);
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return reader.getByteString(peekLength);
}
@@ -297,7 +294,7 @@
}
builder.append(reader, peekLength);
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return builder;
}
@@ -314,7 +311,7 @@
throw DecodeException.fatalError(message);
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return reader.getString(peekLength);
}
@@ -336,7 +333,7 @@
reader = subByteString;
// Reset the state
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
}
/**
@@ -360,7 +357,7 @@
throw DecodeException.fatalError(message);
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
reader.skip(peekLength);
return this;
}
@@ -419,7 +416,7 @@
.get(peekLength, maxElementSize);
throw DecodeException.fatalError(message);
}
- state = ELEMENT_READ_STATE_NEED_VALUE_BYTES;
+ state = ASN1.ELEMENT_READ_STATE_NEED_VALUE_BYTES;
return true;
}
@@ -446,7 +443,7 @@
final int type = reader.get();
peekType = (byte) type;
- state = ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
return true;
}
}
--
Gitblit v1.10.0