From b1d02ff4ce3ae2b9446c222d10d9e8a136afbd63 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 06 Dec 2010 08:09:03 +0000
Subject: [PATCH] Bring in OpenDS commit from Matthew Swift. Update to latest Grizzly. Refactor default transport factory implementation so that it does not conflict with transports used by other Grizzly based services (e.g HTTP).

---
 opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
index fc08a15..699a24a 100644
--- a/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
+++ b/opendj-sdk/sdk/src/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
@@ -255,8 +255,7 @@
   {
     if (options.getTCPNIOTransport() == null)
     {
-      this.transport = GlobalTransportFactory.getInstance()
-          .createTCPTransport();
+      this.transport = LDAPDefaultTCPNIOTransport.getInstance();
     }
     else
     {

--
Gitblit v1.10.0