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 a69dabe10c Standard format for ignored exceptions
a69dabe10c is described below
commit a69dabe10c9bb18ae45656dc16e47bb86a6afdb4
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 5208ce56bd..f822758a06 100644
--- a/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
+++ b/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
@@ -276,12 +276,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 481a79ddd9..df15ea7c0b 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 4c6fc48e2c..e62c042e8d 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -374,6 +374,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 103aee181c..0f13d3270f 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -338,7 +338,7 @@ public class ClassLoaderLogManager extends LogManager {
for (Handler handler : clLogInfo.handlers.values()) {
try {
handler.close();
- } catch (Exception e) {
+ } catch (Exception ignore) {
// Ignore
}
}
@@ -365,7 +365,7 @@ public class ClassLoaderLogManager extends LogManager {
if (info == null) {
try {
readConfiguration(classLoader);
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Ignore
}
info = classLoaderLoggers.get(classLoader);
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 450fc53cac..c16806cf11 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -930,6 +930,7 @@ public class NioEndpoint extends
AbstractNetworkChannelEndpoint<NioChannel,Socke
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 7fafff3dcd..86b5289895 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]
