Merge branch 'mdb.master' of /home/hyc/OD/mdb

[openldap] / contrib / ldapc++ / src / LDAPDeleteRequest.cpp

diff --git a/contrib/ldapc++/src/LDAPDeleteRequest.cpp b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
index 1e914bc0dac51a7fe866c1003cbc755797df9678..4ccb39944a4d35f9254b0af9e4ff9beb04972448 100644 (file)
--- a/contrib/ldapc++/src/LDAPDeleteRequest.cpp
+++ b/contrib/ldapc++/src/LDAPDeleteRequest.cpp
@@ -1,5 +1,6 @@
+// $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,6 +13,8 @@
 #include "LDAPMessageQueue.h"
 #include "LDAPResult.h"
 
+using namespace std;
+
 LDAPDeleteRequest::LDAPDeleteRequest( const LDAPDeleteRequest& req) :
         LDAPRequest(req){
        DEBUG(LDAP_DEBUG_CONSTRUCT, 
@@ -33,9 +36,6 @@ LDAPDeleteRequest::LDAPDeleteRequest(const string& dn,
 LDAPDeleteRequest::~LDAPDeleteRequest(){
     DEBUG(LDAP_DEBUG_DESTROY,
           "LDAPDeleteRequest::~LDAPDeleteRequest()" << endl);
-    // TODO -- flush the entire cache here?  or does this invalidate
-    // cached searches that may have found the deleted entry.
-    m_connection->uncache_entry(m_dn);
 }
 
 LDAPMessageQueue* LDAPDeleteRequest::sendRequest(){
@@ -45,8 +45,8 @@ LDAPMessageQueue* LDAPDeleteRequest::sendRequest(){
     LDAPControl** tmpClCtrls=m_cons->getClCtrlsArray();
     int err=ldap_delete_ext(m_connection->getSessionHandle(),m_dn.c_str(), 
             tmpSrvCtrls, tmpClCtrls ,&msgID);
-    ldap_controls_free(tmpSrvCtrls);
-    ldap_controls_free(tmpClCtrls);
+    LDAPControlSet::freeLDAPControlArray(tmpSrvCtrls);
+    LDAPControlSet::freeLDAPControlArray(tmpClCtrls);
     if(err != LDAP_SUCCESS){
         throw LDAPException(err);
     }else{