From 5ae9a8bbb85b08bdab04ca6d207f2ef144b57520 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 10 Dec 2009 16:26:02 +0000
Subject: [PATCH] Move LDAP implementation classes to com.sun.opends.sdk package.
---
opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1StreamReader.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1StreamReader.java
similarity index 97%
rename from opendj-sdk/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1StreamReader.java
index 77ea4fa..d6ab025 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/ldap/ASN1StreamReader.java
+++ b/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1StreamReader.java
@@ -24,12 +24,12 @@
*
* Copyright 2009 Sun Microsystems, Inc.
*/
-package org.opends.sdk.ldap;
+package com.sun.opends.sdk.ldap;
import static com.sun.opends.sdk.messages.Messages.*;
-import static org.opends.sdk.ldap.LDAPConstants.*;
+import static com.sun.opends.sdk.ldap.LDAPConstants.*;
import java.io.IOException;
import java.nio.BufferUnderflowException;
@@ -51,7 +51,7 @@
/**
* Grizzly ASN1 reader implementation.
*/
-final class ASN1StreamReader extends AbstractASN1Reader implements
+public final class ASN1StreamReader extends AbstractASN1Reader implements
PoolableObject, ASN1Reader
{
class ChildSequenceLimiter implements SequenceLimiter
@@ -265,13 +265,10 @@
{
return false;
}
- if ((state == ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES)
- && !needAdditionalLengthBytesState(true))
- {
- return false;
- }
+ return !((state == ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES)
+ && !needAdditionalLengthBytesState(true)) &&
+ peekLength <= readLimiter.remaining();
- return peekLength <= readLimiter.remaining();
}
--
Gitblit v1.10.0