X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;ds=sidebyside;f=source%2Fldap%2FSession.cpp;h=1d73e846e44747013748a453de9694f7e945b6ff;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=fdf6196d0e1940f54ca1ab0be54338400985f29d;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git

diff --git a/source/ldap/Session.cpp b/source/ldap/Session.cpp
index fdf6196..1d73e84 100644
--- a/source/ldap/Session.cpp
+++ b/source/ldap/Session.cpp
@@ -56,7 +56,7 @@ Session::Session() :
 // Se invoca desde el ldap::Engine
 //---------------------------------------------------------------------------------
 void Session::bind()
-throw(RuntimeException) {
+noexcept(false) {
   if(a_state != State::Closed)
     return;
 
@@ -69,7 +69,6 @@ throw(RuntimeException) {
   LDAP* handle = NULL;
   int aux;
   ResultCode resultCode;
-  Response* response(NULL);
 
   try {
     resultCode = ldap_initialize(&handle, a_url.c_str());
@@ -139,7 +138,7 @@ throw(RuntimeException) {
 }
 
 const Response* Session::send(const Request* request)
-throw(RuntimeException) {
+noexcept(false) {
   if(a_state == State::Closed) {
     string msg(asString());
     msg += " | Session::bind must be called";
@@ -175,7 +174,7 @@ throw(RuntimeException) {
 }
 
 void Session::unbind()
-throw(RuntimeException) {
+noexcept(false) {
   if(a_state == State::Closed)
     return;
 
@@ -190,7 +189,7 @@ throw(RuntimeException) {
 // a la ldap::Session
 //------------------------------------------------------------------------------------------
 void Session::apply()
-throw(RuntimeException) {
+noexcept(false) {
   LOGMETHOD(TraceMethod traceMethod("ldap::Session", "apply", ANNA_FILE_LOCATION));
   LDAP* handle = (LDAP*) a_ldap;
   LDAPMessage* hmessage(NULL);
@@ -264,7 +263,7 @@ throw(RuntimeException) {
  * invocado por el comm::Communicator::detach.
  */
 void Session::finalize()
-throw() {
+{
   LDAP* handle = (LDAP*) a_ldap;
   a_state = State::Closed;
 
@@ -299,7 +298,7 @@ throw() {
 }
 
 void Session::receiveBind(const IdMessage idMessage, Session::HandleMessage _hmessage)
-throw(RuntimeException) {
+noexcept(false) {
   LDAP* handle = (LDAP*) a_ldap;
   LDAPMessage* hmessage = (LDAPMessage*) _hmessage;
 
@@ -359,7 +358,7 @@ throw(RuntimeException) {
 // (1) Necesario para detectar el final de los atributos
 //------------------------------------------------------------------------------------------------
 void Session::receiveEntry(const IdMessage idMessage, Session::HandleMessage _hmessage)
-throw(RuntimeException) {
+noexcept(false) {
   LDAP* handle = (LDAP*) a_ldap;
   LDAPMessage* hmessage = (LDAPMessage*) _hmessage;
   BerElement *ber(NULL);
@@ -419,7 +418,7 @@ throw(RuntimeException) {
 }
 
 void Session::receiveReference(const IdMessage idMessage, Session::HandleMessage _hmessage)
-throw(RuntimeException) {
+noexcept(false) {
   LDAP* handle = (LDAP*) a_ldap;
   LDAPMessage* hmessage = (LDAPMessage*) _hmessage;
   char **values(NULL);
@@ -448,7 +447,7 @@ throw(RuntimeException) {
 }
 
 void Session::receiveResult(const IdMessage idMessage, Session::HandleMessage _hmessage)
-throw(RuntimeException) {
+noexcept(false) {
   LDAP* handle = (LDAP*) a_ldap;
   LDAPMessage* hmessage = (LDAPMessage*) _hmessage;
   Response* response = response_find(idMessage);
@@ -462,7 +461,6 @@ throw(RuntimeException) {
   int error = LDAP_SUCCESS;
   char **values(NULL);
   ResultCode resultCode;
-  bool isOk = true;
   response->cancelTimer();
   const int ldap_result = ldap_parse_result(handle, hmessage, &error, NULL, NULL, &values, NULL, 0);
   resultCode.setValue(ldap_result, error);
@@ -500,7 +498,7 @@ throw(RuntimeException) {
 // Se invoca desde ldap::timer::Prototype::expire
 //-------------------------------------------------------------------------
 void Session::expireResponse(ldap::Response* response)
-throw() {
+{
   LDAP* handle = (LDAP*) a_ldap;
   ResultCode resultCode;
   /*
@@ -537,7 +535,7 @@ throw() {
 }
 
 void Session::response_add(Response* response)
-throw() {
+{
   a_responses.add(response);
   response->setSession(this);
 
@@ -549,13 +547,13 @@ throw() {
 }
 
 void Session::response_erase(Response* response)
-throw() {
+{
   a_responses.erase(response);
   Response::release(response);
 }
 
 Response* Session::response_find(const IdMessage idMessage)
-throw(RuntimeException) {
+noexcept(false) {
   ldap::Response* result = a_responses.find(idMessage);
 
   if(result == NULL) {
@@ -569,7 +567,7 @@ throw(RuntimeException) {
 }
 
 std::string Session::asString() const
-throw() {
+{
   string result("ldap::Session { ");
   result += comm::Handler::asString();
   result += " | State: ";
@@ -592,7 +590,7 @@ throw() {
 }
 
 xml::Node* Session::asXML(xml::Node* parent) const
-throw() {
+{
   parent = comm::Handler::asXML(parent);
   xml::Node* result = parent->createChild("ldap.Session");
   result->createAttribute("State", asText(a_state));
@@ -607,7 +605,6 @@ throw() {
     result->createChild("NetworkTimeout")->createAttribute("Value", getNetworkTimeout());
 
   xml::Node* requests = result->createChild("ldap.Requests");
-  const Response* response;
   const Request* request;
 
   for(const_response_iterator ii = response_begin(), maxii = response_end(); ii != maxii; ii ++) {
@@ -619,7 +616,7 @@ throw() {
 }
 
 int Session::getDangerousFileDescriptor() const
-throw(RuntimeException) {
+noexcept(false) {
   ResultCode resultCode;
   int result = -1;
   resultCode = ldap_get_option((LDAP*) a_ldap, LDAP_OPT_DESC, &result);
@@ -636,12 +633,12 @@ throw(RuntimeException) {
 }
 
 const char* Session::asText(const State::_v state)
-throw() {
+{
   static const char* states [] = { "Closed", "WaitingBind", "Bound" };
   return states [state];
 }
 
 IdMessage Session::SortById::value(const Response* response)
-throw() {
+{
   return response->getIdMessage();
 }