From f2b5fa18b58db09562d03a7d247e21c111e78056 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 07 Nov 2016 13:59:40 +0000
Subject: [PATCH] OPENDJ-3179: Migrate LDAP Connection Handler to SDK Grizzly transport
---
opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java
index 73c7bae..5c7315b 100644
--- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java
+++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java
@@ -11,17 +11,20 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.grizzly;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
+import org.forgerock.opendj.io.LDAP;
import org.forgerock.opendj.io.LDAPReader;
import org.forgerock.opendj.io.LDAPReaderWriterTestCase;
import org.forgerock.opendj.io.LDAPWriter;
import org.forgerock.util.Options;
import org.glassfish.grizzly.memory.HeapMemoryManager;
+import org.glassfish.grizzly.memory.MemoryManager;
+
import static org.forgerock.opendj.ldap.LDAPConnectionFactory.LDAP_DECODE_OPTIONS;
/**
@@ -32,7 +35,7 @@
@Override
protected LDAPWriter<? extends ASN1Writer> getLDAPWriter() {
- return GrizzlyUtils.getWriter();
+ return GrizzlyUtils.getWriter(MemoryManager.DEFAULT_MEMORY_MANAGER);
}
@Override
@@ -41,11 +44,9 @@
}
@Override
- protected void transferFromWriterToReader(LDAPWriter<? extends ASN1Writer> writer,
- LDAPReader<? extends ASN1Reader> reader) {
- ASN1BufferReader asn1Reader = (ASN1BufferReader) reader.getASN1Reader();
- ASN1BufferWriter asn1Writer = (ASN1BufferWriter) writer.getASN1Writer();
- asn1Reader.appendBytesRead(asn1Writer.getBuffer());
+ protected LDAPReader<? extends ASN1Reader> getLDAPReader(LDAPWriter<? extends ASN1Writer> writer) {
+ return LDAP.<ASN1BufferReader> getReader(
+ new ASN1BufferReader(0, ((ASN1BufferWriter) writer.getASN1Writer()).getBuffer()),
+ Options.defaultOptions().get(LDAP_DECODE_OPTIONS));
}
-
}
--
Gitblit v1.10.0