From baefb23b50cf916538e061de157f1e9e81fc5a3c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 08 Jan 2014 16:29:45 +0000
Subject: [PATCH] Fix OPENDJ-1270: Avoid unnecessary DNS lookups when performing bind requests
---
opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java
index 56e7526..465ec23 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2013 ForgeRock AS
+ * Portions copyright 2011-2014 ForgeRock AS
*/
package org.forgerock.opendj.grizzly;
@@ -32,7 +32,7 @@
import static org.forgerock.opendj.ldap.TimeoutChecker.TIMEOUT_CHECKER;
import java.io.IOException;
-import java.net.SocketAddress;
+import java.net.InetSocketAddress;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -207,7 +207,7 @@
private final LDAPClientFilter clientFilter;
private final FilterChain defaultFilterChain;
private final LDAPOptions options;
- private final SocketAddress socketAddress;
+ private final InetSocketAddress socketAddress;
/**
* Prevents the transport and timeoutChecker being released when there are
@@ -235,7 +235,7 @@
* @param options
* The LDAP connection options to use when creating connections.
*/
- public GrizzlyLDAPConnectionFactory(final SocketAddress address, final LDAPOptions options) {
+ public GrizzlyLDAPConnectionFactory(final InetSocketAddress address, final LDAPOptions options) {
this(address, options, null);
}
@@ -253,13 +253,14 @@
* Grizzly TCP Transport NIO implementation to use for
* connections. If {@code null}, default transport will be used.
*/
- public GrizzlyLDAPConnectionFactory(final SocketAddress address, final LDAPOptions options,
+ public GrizzlyLDAPConnectionFactory(final InetSocketAddress address, final LDAPOptions options,
TCPNIOTransport transport) {
this.transport = DEFAULT_TRANSPORT.acquireIfNull(transport);
this.socketAddress = address;
this.options = new LDAPOptions(options);
this.clientFilter = new LDAPClientFilter(this.options.getDecodeOptions(), 0);
- this.defaultFilterChain = GrizzlyUtils.buildFilterChain(this.transport.get().getProcessor(), clientFilter);
+ this.defaultFilterChain =
+ GrizzlyUtils.buildFilterChain(this.transport.get().getProcessor(), clientFilter);
}
@@ -293,12 +294,8 @@
return future;
}
- /**
- * Returns the address of the Directory Server.
- *
- * @return The address of the Directory Server.
- */
- public SocketAddress getSocketAddress() {
+ @Override
+ public InetSocketAddress getSocketAddress() {
return socketAddress;
}
--
Gitblit v1.10.0