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 58d7b458cf Standard format for ignored exceptions
58d7b458cf is described below
commit 58d7b458cf0a96e05a76d933a5bf36d886d84210
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 19 17:51:41 2025 +0100
Standard format for ignored exceptions
---
java/org/apache/catalina/ha/deploy/FileMessageFactory.java | 2 ++
java/org/apache/catalina/tribes/membership/McastServiceImpl.java | 1 +
java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java | 1 +
java/org/apache/juli/ClassLoaderLogManager.java | 4 ++--
java/org/apache/tomcat/util/net/NioEndpoint.java | 1 +
java/org/apache/tomcat/util/net/SecureNioChannel.java | 2 ++
6 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
index d5b8d08df6..978c2e6bb6 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
@@ -286,12 +286,14 @@ public class FileMessageFactory {
try {
in.close();
} catch (IOException ignore) {
+ // Ignore
}
}
if (out != null) {
try {
out.close();
} catch (IOException ignore) {
+ // Ignore
}
}
in = null;
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index 160f7d2996..eec78fd2d4 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -293,6 +293,7 @@ public class McastServiceImpl extends
MembershipProviderBase {
try {
Thread.sleep(memberwait);
} catch (InterruptedException ignore) {
+ // Ignore
}
if (log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.waitForMembers.done",
Integer.toString(level)));
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index ce1ba546af..d40ad1abc0 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -372,6 +372,7 @@ public abstract class AbstractReplicatedMap<K, V>
try {
broadcast(MapMessage.MSG_STOP, false);
} catch (Exception ignore) {
+ // Ignore
}
// cleanup
this.channel.removeChannelListener(this);
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index 869ddcc044..9c3493be89 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -352,7 +352,7 @@ public class ClassLoaderLogManager extends LogManager {
for (Handler handler : clLogInfo.handlers.values()) {
try {
handler.close();
- } catch (Exception e) {
+ } catch (Exception ignore) {
// Ignore
}
}
@@ -381,7 +381,7 @@ public class ClassLoaderLogManager extends LogManager {
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
try {
readConfiguration(classLoaderParam);
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Ignore
}
return null;
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index eb153e1ec6..468dae7440 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -925,6 +925,7 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
try {
sd.fchannel.close();
} catch (Exception ignore) {
+ // Ignore
}
// For calls from outside the Poller, the caller is
// responsible for registering the socket for the
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 77015d6f12..0e35dab0b3 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -401,12 +401,14 @@ public class SecureNioChannel extends NioChannel {
try {
key.cancel();
} catch (Exception ignore) {
+ // Ignore
}
}
if (selector != null) {
try {
selector.close();
} catch (Exception ignore) {
+ // Ignore
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
