Merge branch 'develop' of ssh://barant.com/git/ServerCore into develop

Thread.cpp

@@ -4,6 +4,7 @@
 namespace core {
 
    Thread::Thread(EPoll &ePoll) : ePoll(ePoll) {}
+   Thread::Thread(EPoll &ePoll, ThreadScope *scope) : ePoll(ePoll) {}
 
    Thread::~Thread() {}
 
@@ -45,25 +46,28 @@ namespace core {
 
       while(1) {
 
-	 if(ePoll.isStopping())
+	      if(ePoll.isStopping())
            break;
 
-	 status = "WAITING";
-	 int rc = epoll_wait(ePoll.getDescriptor(), events, 50, -1);
-	 status = "RUNNING";
+	      status = "WAITING";
+	      int rc = epoll_wait(ePoll.getDescriptor(), events, 50, -1);
+	      status = "RUNNING";
 
-	 if(rc < 0) {
-	    // TODO: Make log entry indicating status received and ignore for now.
-	 } else if(rc == 0) {
-	    break;
-	 } else if(rc > 0) {
-	    for(int ix = 0; ix < rc; ++ix) {
-	       ++count;
-	       if(((Socket *)events[ix].data.ptr)->eventReceived(events[ix]))
-		      ePoll.resetSocket((Socket *)events[ix].data.ptr);
-	      }
-	   }
-   }
+	      if(rc < 0) {
+	      // TODO: Make log entry indicating status received and ignore for now.
+	      } else if(rc == 0) {
+	         break;
+	      } else if(rc > 0) {
+	         for(int ix = 0; ix < rc; ++ix) {
+	            ++count;
+	            if(((Socket *)events[ix].data.ptr)->eventReceived(events[ix])) {
+		            ePoll.resetSocket((Socket *)events[ix].data.ptr);
+	            } else { 
+                  delete (Socket *)events[ix].data.ptr;
+               }
+            }
+   	   }
+      }
       coreutils::Log(coreutils::LOG_DEBUG_1) << "Thread ending with thread id " << threadId << ".";
    }