Backport DIRMINA-1095 from 2.1.X

apache · May 4, 2019 · 5f3a628 · 5f3a628
1 parent 1931add
commit 5f3a628
Showing 1 changed file with 28 additions and 21 deletions.
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
@@ -258,27 +258,34 @@ private int registerHandles() {
     }
 
     private void processReadySessions(Set<SelectionKey> handles) {
-        Iterator<SelectionKey> iterator = handles.iterator();
-
-        while (iterator.hasNext()) {
-            SelectionKey key = iterator.next();
-            DatagramChannel handle = (DatagramChannel) key.channel();
-            iterator.remove();
-
-            try {
-                if (key.isValid() && key.isReadable()) {
-                    readHandle(handle);
-                }
-
-                if (key.isValid() && key.isWritable()) {
-                    for (IoSession session : getManagedSessions().values()) {
-                        scheduleFlush((NioSession) session);
-                    }
-                }
-            } catch (Exception e) {
-                ExceptionMonitor.getInstance().exceptionCaught(e);
-            }
-        }
+	final Iterator<SelectionKey> iterator = handles.iterator();
+
+	while (iterator.hasNext()) {
+	    try {
+		final SelectionKey key = iterator.next();
+		final DatagramChannel handle = (DatagramChannel) key.channel();
+
+		if (key.isValid()) {
+		    if (key.isReadable()) {
+			readHandle(handle);
+		    }
+
+		    if (key.isWritable()) {
+			for (IoSession session : getManagedSessions().values()) {
+			    final NioSession x = (NioSession) session;
+			    if (x.getChannel() == handle) {
+				scheduleFlush(x);
+			    }
+			}
+		    }
+		}
+
+	    } catch (Exception e) {
+		ExceptionMonitor.getInstance().exceptionCaught(e);
+	    } finally {
+		iterator.remove();
+	    }
+	}
     }
 
     private boolean scheduleFlush(NioSession session) {