Skip to content
Snippets Groups Projects
Commit f6ae9c86 authored by Andrea Michelotti's avatar Andrea Michelotti
Browse files

minor o major fix?

parent b914a913
No related branches found
No related tags found
No related merge requests found
......@@ -257,7 +257,6 @@ DirectIOClientConnection *ZMQDirectIOClient::_getNewConnectionImpl(std::string s
err = zmq_connect(socket_priority, url.c_str());
if(err) {
error_str = boost::str( boost::format("Error connecting priority socket to %1%") % priority_endpoint);
ZMQDIOLERR_ << error_str;
throw chaos::CException(err, error_str, __FUNCTION__);
}
......@@ -267,23 +266,25 @@ DirectIOClientConnection *ZMQDirectIOClient::_getNewConnectionImpl(std::string s
err = zmq_connect(socket_service, url.c_str());
if(err) {
error_str = boost::str( boost::format("Error connecting service socket to %1%") % service_endpoint);
ZMQDIOLERR_ << error_str;
throw chaos::CException(err, error_str, __FUNCTION__);
}
} catch(chaos::CException& ex) {
ZMQDIOLERR_ << ex.what();
if(socket_priority) {
err = zmq_close(socket_priority);
if(err) ZMQDIOLERR_ << "Error closing service socket";
socket_priority=NULL;
}
if(socket_service) {
err = zmq_close(socket_service);
if(err) ZMQDIOLERR_ << "Error closing service socket";
socket_service=NULL;
}
if(result) {
map_connections.deregisterElementKey(result->getUniqueUUID());
delete(result);
}
result = NULL;
}
return result;
}
......
......@@ -34,3 +34,4 @@ if [ -n "$CHAOS_PREFIX" ]; then
fi
find $chaos_bundle -name "CMakeFiles" -exec rm -rf \{\} \; >& /dev/null
find $chaos_bundle -name "CMakeCache.txt" -exec rm -rf \{\} \; >& /dev/null
find $chaos_bundle -name "cmake_install.cmake" -exec rm -rf \{\} \; >& /dev/null
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment