From 20b30000c1266606a8cdae50a79982f415f11286 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 22 Dec 2010 12:06:31 +0000
Subject: [PATCH] Ensure that correct Grizzly MemoryManager is used for SASL and ASN1 filters.
---
opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java
index 55d3c98..caf2f3f 100644
--- a/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java
+++ b/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/ASN1BufferReader.java
@@ -48,6 +48,8 @@
import org.glassfish.grizzly.Buffer;
import org.glassfish.grizzly.memory.BuffersBuffer;
import org.glassfish.grizzly.memory.CompositeBuffer;
+import org.glassfish.grizzly.memory.MemoryManager;
+
import com.sun.opends.sdk.util.StaticUtils;
@@ -226,13 +228,16 @@
* @param maxElementSize
* The maximum BER element size, or <code>0</code> to indicate that
* there is no limit.
+ * @param memoryManager
+ * The memory manager to use for buffering.
*/
- ASN1BufferReader(final int maxElementSize)
+ ASN1BufferReader(final int maxElementSize,
+ final MemoryManager<?> memoryManager)
{
this.readLimiter = new RootSequenceLimiter();
this.stringBuffer = new byte[MAX_STRING_BUFFER_SIZE];
this.maxElementSize = maxElementSize;
- this.buffer = BuffersBuffer.create();
+ this.buffer = BuffersBuffer.create(memoryManager);
}
--
Gitblit v1.10.0