From 4ca2a9a3650344ed74e55c1bdb646dc88cf91965 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 08 Jan 2014 14:23:51 +0000
Subject: [PATCH] Fix OPENDJ-1270: Avoid unnecessary DNS lookups when performing bind requests

---
 opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
index 03bcc4d..ed4bd3f 100644
--- a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
+++ b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2013 ForgeRock AS
+ *      Portions Copyright 2011-2014 ForgeRock AS
  */
 
 package com.forgerock.opendj.ldap;
@@ -32,7 +32,6 @@
 import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
 
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
@@ -82,6 +81,7 @@
 import org.glassfish.grizzly.ssl.SSLFilter;
 
 import com.forgerock.opendj.util.CompletedFutureResult;
+import com.forgerock.opendj.util.StaticUtils;
 import com.forgerock.opendj.util.Validator;
 
 /**
@@ -253,11 +253,7 @@
         final int messageID = nextMsgID.getAndIncrement();
         final BindClient context;
         try {
-            context =
-                    request.createBindClient(
-                            connection.getPeerAddress() instanceof InetSocketAddress
-                            ? ((InetSocketAddress) connection.getPeerAddress()).getHostName()
-                            : connection.getPeerAddress().toString());
+            context = request.createBindClient(StaticUtils.getHostName(factory.getSocketAddress()));
         } catch (final Exception e) {
             // FIXME: I18N need to have a better error message.
             // FIXME: Is this the best result code?

--
Gitblit v1.10.0