You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by ka...@apache.org on 2011/10/13 17:22:50 UTC

svn commit: r1182902 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java

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() );
     }