From 2a38c60a67c81e7f393962e7b2aa7468111af537 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Thu, 6 Feb 2025 17:25:34 -0600
Subject: [PATCH] Revert "fix event processing in network code"

This reverts commit cd1e38b184d62ffd28f0c2c0e1f8d64db7ab5fc8.
---
 src/engine/net/AbstractConnectionManager.java | 52 ++++++-------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/src/engine/net/AbstractConnectionManager.java b/src/engine/net/AbstractConnectionManager.java
index c468795f..0810fbb7 100644
--- a/src/engine/net/AbstractConnectionManager.java
+++ b/src/engine/net/AbstractConnectionManager.java
@@ -362,63 +362,45 @@ public abstract class AbstractConnectionManager extends ControlledRunnable {
 
         selectedKeys = this.selector.selectedKeys().iterator();
 
-        // No need for the "if selectedKeys.hasNext() == false" check here
+        if (selectedKeys.hasNext() == false)
+            return;
+
         while (selectedKeys.hasNext()) {
             thisKey = selectedKeys.next();
 
-            // To shake out any issues, logging null attachments
-            if (thisKey.attachment() == null) {
+            //To shake out any issues
+            if (thisKey.attachment() == null)
                 Logger.error("Found null attachment! PANIC!");
-                selectedKeys.remove(); // Safely remove invalid keys from the set
-                continue; // Skip to the next key
-            }
 
-            // Check for task execution state and continue if already running
-            if (thisKey.attachment() instanceof AbstractConnection) {
-                AbstractConnection connection = (AbstractConnection) thisKey.attachment();
-                if (connection.execTask.get()) {
-                    selectedKeys.remove(); // Safely remove the key from selected keys
-                    continue; // Skip to the next key
-                }
-            }
-
-            try {
-                // Validity check for the key, move the removal after key validation
-                if (!thisKey.isValid()) {
-                    Logger.warn("Invalid SelectionKey found. Skipping.");
-                    selectedKeys.remove(); // Remove invalid keys after validity check
+            if (thisKey.attachment() instanceof AbstractConnection)
+                if (((AbstractConnection) thisKey.attachment()).execTask.get() == true)
                     continue;
-                }
 
-                // Process the appropriate operation based on the key state
-                if (thisKey.isAcceptable()) {
+            selectedKeys.remove();
+
+            try {
+                if (thisKey.isValid() == false)
+                    break;  // Changed from continue
+                else if (thisKey.isAcceptable())
                     this.acceptNewConnection(thisKey);
-                } else if (thisKey.isReadable()) {
+                else if (thisKey.isReadable())
                     jm.submitJob(new ReadOperationHander(thisKey));
-                } else if (thisKey.isWritable()) {
+                else if (thisKey.isWritable())
                     jm.submitJob(new WriteOperationHander(thisKey));
-                } else if (thisKey.isConnectable()) {
+                else if (thisKey.isConnectable())
                     this.finishConnectingTo(thisKey);
-                } else {
+                else
                     Logger.error("Unhandled keystate: " + thisKey.toString());
-                }
-
-                // Safely remove processed key
-                selectedKeys.remove();
-
             } catch (CancelledKeyException cke) {
                 Logger.error(this.getLocalNodeName(), cke);
                 this.disconnect(thisKey);
-                selectedKeys.remove(); // Safely remove cancelled key
 
             } catch (IOException e) {
                 Logger.error(this.getLocalNodeName(), e);
-                selectedKeys.remove(); // Safely remove on error
             }
         }
     }
 
-
     protected void connectTo(String host, int port) {
         try {
             this.connectTo(InetAddress.getByName(host), port);