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 2010/01/20 04:17:58 UTC

svn commit: r901042 - /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java

Author: kayyagari
Date: Wed Jan 20 03:17:55 2010
New Revision: 901042

URL: http://svn.apache.org/viewvc?rev=901042&view=rev
Log:
added the missing control to SearchResultEntry

Modified:
    directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java?rev=901042&r1=901041&r2=901042&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/ldap/client/api/LdapConnection.java Wed Jan 20 03:17:55 2010
@@ -384,6 +384,17 @@
         searchResultEntry.setMessageId( searchEntryResultCodec.getMessageId() );
         searchResultEntry.setEntry( searchEntryResultCodec.getEntry() );
         
+        ControlCodec cc = searchEntryResultCodec.getCurrentControl();
+        Control control = new BasicControl( cc.getControlType(), cc.getCriticality(), cc.getEncodedValue() );
+        try
+        {
+            searchResultEntry.add( control );
+        }
+        catch( Exception e )
+        {
+            //shouldn't happen
+        }
+        
         return searchResultEntry;
     }