[HICN-60] Solved concurrent memory access which was leading to seg-fault

Change-Id: I7b9fcf79bb97650346f7d92af8cbb419f0a5cb95
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc b/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc
index 81b471857..6df9e5656 100644
--- a/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc
+++ b/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc
@@ -51,10 +51,9 @@ int EpollEventReactor::addFileDescriptor(int fd, uint32_t events) {
 int EpollEventReactor::addFileDescriptor(int fd, uint32_t events,
                                          EventCallback &callback) {
   auto it = event_callback_map_.find(fd);
-  event_callback_map_[fd] = callback;
-  if (it != event_callback_map_.end()) {
+
+  if (it == event_callback_map_.end()) {
     event_callback_map_[fd] = callback;
-  } else {
     return addFileDescriptor(fd, events);
   }
 
@@ -64,10 +63,9 @@ int EpollEventReactor::addFileDescriptor(int fd, uint32_t events,
 int EpollEventReactor::addFileDescriptor(int fd, uint32_t events,
                                          EventCallback &&callback) {
   auto it = event_callback_map_.find(fd);
-  event_callback_map_[fd] = callback;
-  if (it != event_callback_map_.end()) {
+
+  if (it == event_callback_map_.end()) {
     event_callback_map_[fd] = callback;
-  } else {
     return addFileDescriptor(fd, events);
   }