From 46a7d32926385c97696f2b52605171139dc773e6 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 01 Feb 2012 11:43:19 +0000
Subject: [PATCH] Fix OPENDJ-417: Minor improvements to server-side SSL support

---
 opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
index 97e25b0..d6b4273 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java
@@ -23,7 +23,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions copyright 2011 ForgeRock AS
+ *      Portions copyright 2011-2012 ForgeRock AS
  */
 
 package org.forgerock.opendj.ldap;
@@ -371,7 +371,7 @@
                 }
               };
 
-              clientContext.startSASL(csl);
+              clientContext.enableConnectionSecurityLayer(csl);
             }
 
           }
@@ -576,7 +576,7 @@
         final R result = request.getResultDecoder().newExtendedErrorResult(
             ResultCode.SUCCESS, "", "");
         resultHandler.handleResult(result);
-        clientContext.startTLS(sslContext, null, sslContext.getSocketFactory()
+        clientContext.enableTLS(sslContext, null, sslContext.getSocketFactory()
             .getSupportedCipherSuites(), false, false);
       }
     }

--
Gitblit v1.10.0