MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Revert "fix event processing in network code"

Browse Source 
This reverts commit cd1e38b184.
This commit is contained in:
FatBoy-DOTC
2025-02-06 17:25:34 -06:00
parent cd1e38b184
commit 2a38c60a67
1 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/AbstractConnectionManager.java
+17 -35
View File
@@ -362,63 +362,45 @@ public abstract class AbstractConnectionManager extends ControlledRunnable {
selectedKeys = this.selector.selectedKeys().iterator(); selectedKeys = this.selector.selectedKeys().iterator();
// No need for the "if selectedKeys.hasNext() == false" check here if (selectedKeys.hasNext() == false)
return;
while (selectedKeys.hasNext()) { while (selectedKeys.hasNext()) {
thisKey = selectedKeys.next(); thisKey = selectedKeys.next();
// To shake out any issues, logging null attachments //To shake out any issues
if (thisKey.attachment() == null) { if (thisKey.attachment() == null)
Logger.error("Found null attachment! PANIC!"); 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)
if (thisKey.attachment() instanceof AbstractConnection) { if (((AbstractConnection) thisKey.attachment()).execTask.get() == true)
AbstractConnection connection = (AbstractConnection) thisKey.attachment(); continue;
if (connection.execTask.get()) {
selectedKeys.remove(); // Safely remove the key from selected keys selectedKeys.remove();
continue; // Skip to the next key
}
}
try { try {
// Validity check for the key, move the removal after key validation if (thisKey.isValid() == false)
if (!thisKey.isValid()) { break; // Changed from continue
Logger.warn("Invalid SelectionKey found. Skipping."); else if (thisKey.isAcceptable())
selectedKeys.remove(); // Remove invalid keys after validity check
continue;
}
// Process the appropriate operation based on the key state
if (thisKey.isAcceptable()) {
this.acceptNewConnection(thisKey); this.acceptNewConnection(thisKey);
} else if (thisKey.isReadable()) { else if (thisKey.isReadable())
jm.submitJob(new ReadOperationHander(thisKey)); jm.submitJob(new ReadOperationHander(thisKey));
} else if (thisKey.isWritable()) { else if (thisKey.isWritable())
jm.submitJob(new WriteOperationHander(thisKey)); jm.submitJob(new WriteOperationHander(thisKey));
} else if (thisKey.isConnectable()) { else if (thisKey.isConnectable())
this.finishConnectingTo(thisKey); this.finishConnectingTo(thisKey);
} else { else
Logger.error("Unhandled keystate: " + thisKey.toString()); Logger.error("Unhandled keystate: " + thisKey.toString());
}
// Safely remove processed key
selectedKeys.remove();
} catch (CancelledKeyException cke) { } catch (CancelledKeyException cke) {
Logger.error(this.getLocalNodeName(), cke); Logger.error(this.getLocalNodeName(), cke);
this.disconnect(thisKey); this.disconnect(thisKey);
selectedKeys.remove(); // Safely remove cancelled key
} catch (IOException e) { } catch (IOException e) {
Logger.error(this.getLocalNodeName(), e); Logger.error(this.getLocalNodeName(), e);
selectedKeys.remove(); // Safely remove on error
} }
} }
} }
protected void connectTo(String host, int port) { protected void connectTo(String host, int port) {
try { try {
this.connectTo(InetAddress.getByName(host), port); this.connectTo(InetAddress.getByName(host), port);