This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 55f3eb9148 Better error handling - partial revert of 607ebc0
55f3eb9148 is described below

commit 55f3eb9148233054fccfdf761141c6894a050be1
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Mar 30 09:01:48 2026 +0100

    Better error handling - partial revert of 607ebc0
---
 .../apache/catalina/tribes/group/interceptors/EncryptInterceptor.java  | 2 +-
 webapps/docs/changelog.xml                                             | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java 
b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
index 563e61337b..0a19ba6687 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
@@ -139,10 +139,10 @@ public class EncryptInterceptor extends 
ChannelInterceptorBase implements Encryp
             xbb.clear();
             xbb.append(data, 0, data.length);
 
+            super.messageReceived(msg);
         } catch (GeneralSecurityException gse) {
             log.error(sm.getString("encryptInterceptor.decrypt.failed"), gse);
         }
-        super.messageReceived(msg);
     }
 
     /**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f699f5de05..0189e48bad 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,9 @@
         Reduce log verbosity of the Kubernetes connection attempts and failure.
         (remm)
       </fix>
+      <fix>
+        Better error handling for the <code>EncryptInterceptor</code>. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to