session

Socket.cpp

@@ -68,7 +68,7 @@ namespace core
    void Socket::onUnregistered() {}
 
    bool Socket::eventReceived(struct epoll_event event, long long eventId) {
-      lock.lock();
+//      lock.lock();
 		inHandler = true;
       if(event.events & EPOLLRDHUP) {
          readHangup = true;
@@ -85,7 +85,7 @@ namespace core
          shutdown();
       }
 		inHandler = false;
-      lock.unlock();
+//      lock.unlock();
       return !shutDown;
    }
 
@@ -149,9 +149,9 @@ namespace core
       fifo.emplace(data);
       outlock.unlock();
 		 if(sender && (sender != this))
-         lock.lock();
-		   ePoll.resetSocket(this);
-         lock.unlock();
+          if(!inHandler) {
+		      ePoll.resetSocket(this);
+          }
       return 1;
    }