From a94cb8c8073c31b911020e8565bbd4bd60b37bad Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 24 May 2011 16:34:03 +0000
Subject: [PATCH] Fix OPENDJ-40: Upgrade to latest Grizzly
---
opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
index 93da14b..2f2d80d 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package com.forgerock.opendj.ldap;
@@ -37,11 +38,8 @@
import org.forgerock.opendj.asn1.ASN1WriterTestCase;
import org.forgerock.opendj.ldap.DecodeException;
import org.glassfish.grizzly.Buffer;
-import org.glassfish.grizzly.TransportFactory;
import org.glassfish.grizzly.memory.ByteBufferWrapper;
-
-import com.forgerock.opendj.ldap.ASN1BufferReader;
-import com.forgerock.opendj.ldap.ASN1BufferWriter;
+import org.glassfish.grizzly.memory.MemoryManager;
@@ -70,9 +68,10 @@
protected ASN1Reader getReader(final byte[] encodedBytes)
throws DecodeException, IOException
{
- final ByteBufferWrapper buffer = new ByteBufferWrapper(ByteBuffer.wrap(encodedBytes));
- final ASN1BufferReader reader = new ASN1BufferReader(0, TransportFactory
- .getInstance().getDefaultMemoryManager());
+ final ByteBufferWrapper buffer = new ByteBufferWrapper(
+ ByteBuffer.wrap(encodedBytes));
+ final ASN1BufferReader reader = new ASN1BufferReader(0,
+ MemoryManager.DEFAULT_MEMORY_MANAGER);
reader.appendBytesRead(buffer);
return reader;
}
--
Gitblit v1.10.0