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/ASN1InputStreamReader.java | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
index b88c07f..8ce39e2 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1InputStreamReader.java
@@ -27,10 +27,6 @@
package org.forgerock.opendj.asn1;
-import static org.forgerock.opendj.asn1.ASN1Constants.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
-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;
@@ -50,7 +46,7 @@
* An ASN1Reader that reads from an input stream.
*/
final class ASN1InputStreamReader 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;
@@ -97,14 +93,14 @@
* {@inheritDoc}
*/
public boolean elementAvailable() throws IOException {
- if ((state == ELEMENT_READ_STATE_NEED_TYPE) && !needTypeState(false, false)) {
+ if ((state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) && !needTypeState(false, false)) {
return false;
}
- if ((state == ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE)
+ if ((state == ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE)
&& !needFirstLengthByteState(false, false)) {
return false;
}
- if ((state == ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES)
+ if ((state == ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES)
&& !needAdditionalLengthBytesState(false, false)) {
return false;
}
@@ -124,7 +120,7 @@
return (subSq.getSizeLimit() - subSq.getBytesRead() > 0);
}
- return (state != ELEMENT_READ_STATE_NEED_TYPE) || needTypeState(true, false);
+ return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE) || needTypeState(true, false);
}
/**
@@ -134,11 +130,11 @@
peekType();
switch (state) {
- case ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE:
+ case ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE:
needFirstLengthByteState(true, true);
break;
- case ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES:
+ case ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES:
needAdditionalLengthBytesState(true, true);
}
@@ -149,7 +145,7 @@
* {@inheritDoc}
*/
public byte peekType() throws IOException {
- if (state == ELEMENT_READ_STATE_NEED_TYPE) {
+ if (state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) {
needTypeState(true, true);
}
@@ -180,7 +176,7 @@
String.valueOf(readByte != 0x00)));
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return readByte != 0x00;
}
@@ -212,7 +208,7 @@
in = streamStack.removeFirst();
// Reset the state
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
}
/**
@@ -268,7 +264,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;
@@ -291,7 +287,7 @@
intValue));
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return intValue;
}
}
@@ -314,7 +310,7 @@
peekType, peekLength));
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
}
/**
@@ -325,7 +321,7 @@
peekLength();
if (peekLength == 0) {
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return ByteString.empty();
}
@@ -349,7 +345,7 @@
"READ ASN.1 OCTETSTRING(type=0x%x, length=%d)", peekType, peekLength));
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return ByteString.wrap(value);
}
@@ -361,7 +357,7 @@
peekLength();
if (peekLength == 0) {
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return builder;
}
@@ -383,7 +379,7 @@
"READ ASN.1 OCTETSTRING(type=0x%x, length=%d)", peekType, peekLength));
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return builder;
}
@@ -395,7 +391,7 @@
peekLength();
if (peekLength == 0) {
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return "";
}
@@ -416,7 +412,7 @@
bytesNeeded -= bytesRead;
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
String str;
try {
@@ -457,7 +453,7 @@
in = subStream;
// Reset the state
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
}
/**
@@ -481,7 +477,7 @@
final LocalizableMessage message = ERR_ASN1_SKIP_TRUNCATED_VALUE.get(peekLength);
throw DecodeException.fatalError(message);
}
- state = ELEMENT_READ_STATE_NEED_TYPE;
+ state = ASN1.ELEMENT_READ_STATE_NEED_TYPE;
return this;
}
@@ -509,7 +505,7 @@
while (lengthBytesNeeded > 0) {
readByte = in.read();
if (readByte == -1) {
- state = ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
+ state = ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
if (throwEofException) {
final LocalizableMessage message =
ERR_ASN1_TRUNCATED_LENGTH_BYTES.get(lengthBytesNeeded);
@@ -529,7 +525,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;
}
@@ -572,14 +568,14 @@
peekLength = 0x00;
if (!isBlocking && (in.available() < lengthBytesNeeded)) {
- state = ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
+ state = ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
return false;
}
while (lengthBytesNeeded > 0) {
readByte = in.read();
if (readByte == -1) {
- state = ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
+ state = ASN1.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
if (throwEofException) {
final LocalizableMessage message =
ERR_ASN1_TRUNCATED_LENGTH_BYTES.get(lengthBytesNeeded);
@@ -600,7 +596,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;
}
@@ -635,7 +631,7 @@
}
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