Fix event handling (wasn't sufficiently selective).

mnlipp · May 6, 2024 · 9349207 · 9349207
1 parent 09fbe05
commit 9349207
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/org.jgrapes.io/src/org/jgrapes/net/SocketConnectionManager.java b/org.jgrapes.io/src/org/jgrapes/net/SocketConnectionManager.java
@@ -237,6 +237,9 @@ public SocketChannelImpl(OpenSocketConnection openEvent,
                 }, 2)
                     .setName(channelName + ".downstream.buffers");
 
+            // Ready to use
+            channels.add(this);
+
             // Register with dispatcher
             nioChannel.configureBlocking(false);
             SocketConnectionManager.this.fire(

diff --git a/org.jgrapes.io/src/org/jgrapes/net/SocketConnector.java b/org.jgrapes.io/src/org/jgrapes/net/SocketConnector.java
@@ -72,7 +72,7 @@ public void onOpenConnection(OpenSocketConnection event) {
         try {
             @SuppressWarnings("PMD.CloseResource")
             SocketChannel socketChannel = SocketChannel.open(event.address());
-            channels.add(new SocketChannelImpl(event, socketChannel));
+            new SocketChannelImpl(event, socketChannel);
         } catch (ConnectException e) {
             fire(new ConnectError(event, "Connection refused.", e));
         } catch (IOException e) {
@@ -93,7 +93,8 @@ public void onOpenConnection(OpenSocketConnection event) {
     public void onRegistered(NioRegistration.Completed event)
             throws InterruptedException, IOException {
         NioHandler handler = event.event().handler();
-        if (!(handler instanceof SocketChannelImpl)) {
+        if (!(handler instanceof SocketChannelImpl)
+            || !channels.contains(handler)) {
             return;
         }
         if (event.event().get() == null) {

diff --git a/org.jgrapes.io/src/org/jgrapes/net/SocketServer.java b/org.jgrapes.io/src/org/jgrapes/net/SocketServer.java
@@ -423,7 +423,8 @@ public void onRegistered(NioRegistration.Completed event)
             fire(new Ready(serverSocketChannel.getLocalAddress()));
             return;
         }
-        if (handler instanceof SocketChannelImpl channel) {
+        if (handler instanceof SocketChannelImpl channel
+            && channels.contains(channel)) {
             var accepted = new Accepted(channel.nioChannel().getLocalAddress(),
                 channel.nioChannel().getRemoteAddress(), false,
                 Collections.emptyList());
@@ -461,7 +462,7 @@ public void handleOps(int ops) {
                     }
                     return;
                 }
-                channels.add(new SocketChannelImpl(null, socketChannel));
+                new SocketChannelImpl(null, socketChannel);
             } catch (IOException e) {
                 fire(new IOError(null, e));
             }

diff --git a/org.jgrapes.mail/src/org/jgrapes/mail/MailSender.java b/org.jgrapes.mail/src/org/jgrapes/mail/MailSender.java
@@ -157,9 +157,11 @@ public void onOpenMailSender(OpenMailSender event, Channel channel)
      * @throws MessagingException the messaging exception
      */
     @Handler
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
     public void onMessage(SendMailMessage event, Channel channel)
             throws MessagingException {
-        if (channel instanceof SenderChannel chan) {
+        if (channel instanceof SenderChannel chan
+            && chan.mailSender() == this) {
             chan.sendMessage(event);
         } else {
             systemChannel.sendMessage(event);
@@ -208,6 +210,10 @@ public SenderChannel(Event<?> event, Channel mainChannel,
                 = Components.schedule(timer -> closeConnection(), maxIdleTime);
         }
 
+        private MailSender mailSender() {
+            return MailSender.this;
+        }
+
         /**
          * Send the message provided by the event.
          *