From 85e2fdac288ffab3b99f3de09953be5226194ac8 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 06 Dec 2010 08:09:03 +0000
Subject: [PATCH] Bring in OpenDS commit from Matthew Swift. Update to latest Grizzly. Refactor default transport factory implementation so that it does not conflict with transports used by other Grizzly based services (e.g HTTP).
---
sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java b/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java
index 78ff32d..55d3c98 100644
--- a/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java
+++ b/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java
@@ -46,7 +46,7 @@
import org.opends.sdk.asn1.AbstractASN1Reader;
import org.glassfish.grizzly.Buffer;
-import org.glassfish.grizzly.memory.ByteBuffersBuffer;
+import org.glassfish.grizzly.memory.BuffersBuffer;
import org.glassfish.grizzly.memory.CompositeBuffer;
import com.sun.opends.sdk.util.StaticUtils;
@@ -232,7 +232,7 @@
this.readLimiter = new RootSequenceLimiter();
this.stringBuffer = new byte[MAX_STRING_BUFFER_SIZE];
this.maxElementSize = maxElementSize;
- this.buffer = ByteBuffersBuffer.create();
+ this.buffer = BuffersBuffer.create();
}
--
Gitblit v1.10.0