You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/08/23 11:31:31 UTC
[tomcat] branch main updated: Refactor - no functional change
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new c1a5240 Refactor - no functional change
c1a5240 is described below
commit c1a524050f2be7c9d4e74dec4af06180b9fb348d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Aug 23 12:31:22 2021 +0100
Refactor - no functional change
---
.../catalina/tribes/transport/nio/ParallelNioSender.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
index 0d250f9..3372b39 100644
--- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
@@ -323,21 +323,20 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
private synchronized void close() throws ChannelException {
ChannelException x = null;
- Object[] members = nioSenders.keySet().toArray();
- for (Object member : members) {
- Member mbr = (Member) member;
+ Iterator<Map.Entry<Member,NioSender>> iter = nioSenders.entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry<Member,NioSender> entry = iter.next();
try {
- NioSender sender = nioSenders.get(mbr);
- sender.disconnect();
+ entry.getValue().disconnect();
} catch (Exception e) {
if (x == null) {
x = new ChannelException(e);
}
- x.addFaultyMember(mbr, e);
+ x.addFaultyMember(entry.getKey(), e);
}
- nioSenders.remove(mbr);
+ iter.remove();
}
- if ( x != null ) {
+ if (x != null) {
throw x;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org