This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fcb60b6a69 Standard format for ignored exceptions
fcb60b6a69 is described below
commit fcb60b6a695557fdf9dc0934239ac658a32363c0
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 e7ae1a30f3..c91d3e767b 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 b854687c51..9dd30ce1a0 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -292,6 +292,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 3d918f942a..d0c942f1bc 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -364,7 +364,7 @@ public class ClassLoaderLogManager extends LogManager {
for (Handler handler : clLogInfo.handlers.values()) {
try {
handler.close();
- } catch (Exception e) {
+ } catch (Exception ignore) {
// Ignore
}
}
@@ -393,7 +393,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 9d5cb920f3..6ec24fbfe7 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -983,6 +983,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 a03ef03501..f70fead2b0 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -403,12 +403,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]
