HPCC-32960 review changes

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
hpcc-systems · Nov 11, 2024 · 3f76392 · 3f76392
1 parent 6a66007
commit 3f76392
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/system/jlib/jsocket.cpp b/system/jlib/jsocket.cpp
@@ -4800,9 +4800,12 @@ class CSocketSelectThread: public CSocketBaseThread
         unsigned n=0;
         ForEachItemIn(i,items) {
             SelectItem &si = items.element(i);
-            if (!si.del) {
-                if (si.sock==sock) {
+            if (!si.del)
+            {
+                if (si.sock==sock)
+                {
                     si.del = true;
+                    break;
                 }
                 else 
                     n++;
@@ -5524,6 +5527,7 @@ class CSocketEpollThread: public CSocketBaseThread
                 {
                     si.del = true;
                     rm = SOCK_REMOVED;
+                    break;
                 }
                 else
                     n++;
@@ -5828,7 +5832,7 @@ class CSocketEpollHandler: implements ISocketSelectHandler, public CInterface
                 addrm |= threads.item(i).add(sock,mode,nfy);
                 // if both added and removed, we're done
                 if (((addrm & (SOCK_ADDED | SOCK_REMOVED)) == (SOCK_ADDED | SOCK_REMOVED)) ||
-                    (addrm == SOCK_FAILED))
+                    (addrm & SOCK_FAILED))
                     return;
             }
             else if (!(addrm & SOCK_REMOVED))