Changed the order of checking for connectable and readable keys (http…

…s://issues.redhat.com/browse/JGRP-2531)
belaban · Aug 16, 2021 · 0e9a071 · 0e9a071
1 parent 3f419f7
commit 0e9a071
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/org/jgroups/blocks/cs/NioBaseServer.java b/src/org/jgroups/blocks/cs/NioBaseServer.java
@@ -133,19 +133,20 @@ public void run() {
                     try {
                         if(!key.isValid())
                             continue;
-                        if(key.isReadable())
-                            conn.receive();
-                        if(key.isWritable())
-                            conn.send();
-                        if(key.isAcceptable())
-                            handleAccept(key);
-                        else if(key.isConnectable()) {
+                        // a key can be connectable *and* readable (https://issues.redhat.com/browse/JGRP-2531)
+                        if(key.isConnectable()) {
                             SocketChannel ch=(SocketChannel)key.channel();
                             if(ch.finishConnect() || ch.isConnected()) {
                                 conn.clearSelectionKey(SelectionKey.OP_CONNECT);
                                 conn.connected(true);
                             }
                         }
+                        if(key.isReadable())
+                            conn.receive();
+                        if(key.isWritable())
+                            conn.send();
+                        if(key.isAcceptable())
+                            handleAccept(key);
                     }
                     catch(Throwable ex) {
                         closeConnection(conn);