From commits-return-32503-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Oct 13 15:23:14 2011 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 49CFE9A70 for ; Thu, 13 Oct 2011 15:23:14 +0000 (UTC) Received: (qmail 13173 invoked by uid 500); 13 Oct 2011 15:23:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 13110 invoked by uid 500); 13 Oct 2011 15:23:14 -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 13103 invoked by uid 99); 13 Oct 2011 15:23:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 15:23:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 15:23:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A927223889DE for ; Thu, 13 Oct 2011 15:22:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1182902 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java Date: Thu, 13 Oct 2011 15:22:50 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111013152250.A927223889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Thu Oct 13 15:22:50 2011 New Revision: 1182902 URL: http://svn.apache.org/viewvc?rev=1182902&view=rev Log: o fixed the wrong copying of controls Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java?rev=1182902&r1=1182901&r2=1182902&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java Thu Oct 13 15:22:50 2011 @@ -62,7 +62,7 @@ public class LdapProtocolUtils { if ( request.getControls() != null ) { - request.addAllControls( request.getControls().values().toArray( LdapProtocolConstants.EMPTY_CONTROLS ) ); + opContext.addRequestControls( request.getControls().values().toArray( LdapProtocolConstants.EMPTY_CONTROLS ) ); } } @@ -76,7 +76,7 @@ public class LdapProtocolUtils */ public static void setResponseControls( OperationContext opContext, Response response ) throws Exception { - opContext.addRequestControls( opContext.getResponseControls() ); + response.addAllControls( opContext.getResponseControls() ); }