Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 35548 invoked from network); 26 Aug 2007 05:40:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Aug 2007 05:40:46 -0000 Received: (qmail 61320 invoked by uid 500); 26 Aug 2007 05:40:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61287 invoked by uid 500); 26 Aug 2007 05:40:42 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 61276 invoked by uid 99); 26 Aug 2007 05:40:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Aug 2007 22:40:42 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Aug 2007 05:41:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A04071A9832; Sat, 25 Aug 2007 22:40:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r569768 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java Date: Sun, 26 Aug 2007 05:40:23 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070826054023.A04071A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sat Aug 25 22:40:22 2007 New Revision: 569768 URL: http://svn.apache.org/viewvc?rev=569768&view=rev Log: fix for DIRSERVER-1033 Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java?rev=569768&r1=569767&r2=569768&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java Sat Aug 25 22:40:22 2007 @@ -231,15 +231,13 @@ // Now, get the context LdapContext ctx = getLdapContext( session, bindRequest, env ); - ServerLdapContext newCtx = ( ServerLdapContext ) ctx.lookup( "" ); - - // Inject controls into the context - setRequestControls( newCtx, bindRequest ); // Test that we successfully got one. If not, an error has already been returned. if ( ctx != null ) { - SessionRegistry.getSingleton().setLdapContext( session, ctx ); + ServerLdapContext newCtx = ( ServerLdapContext ) ctx.lookup( "" ); + setRequestControls( newCtx, bindRequest ); + SessionRegistry.getSingleton().setLdapContext( session, newCtx ); bindResult.setResultCode( ResultCodeEnum.SUCCESS ); BindResponse response = ( BindResponse ) bindRequest.getResultResponse(); response.addAll( newCtx.getResponseControls() );