From 86ad6a08499797f9b3204896caee947abb03394f 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/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
index cffc311..a888cc3 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
@@ -88,6 +88,7 @@
/** LDAP connection implementation. */
final class GrizzlyLDAPConnection implements LDAPConnectionImpl, TimeoutEventListener {
+ static final int LDAP_V3 = 3;
/**
* A dummy SSL client engine configurator as SSLFilter only needs client
* config. This prevents Grizzly from needlessly using JVM defaults which
@@ -186,7 +187,7 @@
}
private LdapPromise<Void> sendAbandonRequest(final AbandonRequest request) {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
final int messageID = nextMsgID.getAndIncrement();
writer.writeAbandonRequest(messageID, request);
@@ -212,7 +213,8 @@
pendingRequests.put(messageID, promise);
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeAddRequest(messageID, request);
connection.write(writer.getASN1Writer().getBuffer(), null);
@@ -285,7 +287,8 @@
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
// Use the bind client to get the initial request instead of
// using the bind request passed to this method.
@@ -333,7 +336,8 @@
pendingRequests.put(messageID, promise);
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeCompareRequest(messageID, request);
connection.write(writer.getASN1Writer().getBuffer(), null);
@@ -363,7 +367,8 @@
pendingRequests.put(messageID, promise);
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeDeleteRequest(messageID, request);
connection.write(writer.getASN1Writer().getBuffer(), null);
@@ -409,7 +414,8 @@
pendingRequests.put(messageID, promise);
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeExtendedRequest(messageID, request);
connection.write(writer.getASN1Writer().getBuffer(), null);
@@ -454,7 +460,8 @@
pendingRequests.put(messageID, promise);
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeModifyRequest(messageID, request);
connection.write(writer.getASN1Writer().getBuffer(), null);
@@ -484,7 +491,8 @@
pendingRequests.put(messageID, promise);
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeModifyDNRequest(messageID, request);
connection.write(writer.getASN1Writer().getBuffer(), null);
@@ -524,7 +532,8 @@
pendingRequests.put(messageID, promise);
}
try {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer =
+ GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeSearchRequest(messageID, request);
connection.write(writer.getASN1Writer().getBuffer(), null);
@@ -668,7 +677,7 @@
* connection and release resources.
*/
if (notifyClose) {
- final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager());
+ final LDAPWriter<ASN1BufferWriter> writer = GrizzlyUtils.getWriter(connection.getMemoryManager(), LDAP_V3);
try {
writer.writeUnbindRequest(nextMsgID.getAndIncrement(), unbindRequest);
connection.write(writer.getASN1Writer().getBuffer(), null);
--
Gitblit v1.10.0