This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 161394fdf6 Increase visibility of TLS errors when receiving cluster
messages.
161394fdf6 is described below
commit 161394fdf6ff53720ba2063b993e067ab70fed33
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Nov 20 13:54:06 2026 +0000
Increase visibility of TLS errors when receiving cluster messages.
---
java/org/apache/catalina/tribes/transport/nio/NioReceiver.java | 6 ++++--
webapps/docs/changelog.xml | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index c801676daa..4e825fe312 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -38,6 +38,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
+import javax.net.ssl.SSLException;
+
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.io.ChannelData;
@@ -185,12 +187,12 @@ public class NioReceiver extends ReceiverBase implements
Runnable, NioReceiverMB
}
}
}
+ } catch (RuntimeException | SSLException e) {
+ log.warn(sm.getString("nioReceiver.requestError"), e);
} catch (IOException ioe) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("nioReceiver.requestError"), ioe);
}
- } catch (RuntimeException re) {
- log.warn(sm.getString("nioReceiver.requestError"), re);
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7f6fa7658b..cad2b50805 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -262,6 +262,10 @@
Improve reporting of faulty members when sending of cluster messages
fails. (markt)
</fix>
+ <fix>
+ Increase visibility of TLS errors when receiving cluster messages.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]