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 f950586523 Code clean-up - no functional change. Use 't' for throwable
f950586523 is described below
commit f9505865233e2638ee13676b3c32b30b67edacd5
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 19 12:31:06 2025 +0100
Code clean-up - no functional change. Use 't' for throwable
Find and replace with Cursor
Checked manually
---
.../catalina/core/ApplicationDispatcher.java | 16 ++++-----
.../catalina/core/ApplicationFilterChain.java | 12 +++++--
java/org/apache/catalina/core/ContainerBase.java | 6 ++--
java/org/apache/catalina/core/StandardWrapper.java | 10 +++---
.../apache/catalina/core/StandardWrapperValve.java | 38 +++++++++++-----------
java/org/apache/catalina/realm/JAASRealm.java | 12 +++----
.../apache/catalina/realm/UserDatabaseRealm.java | 6 ++--
.../catalina/valves/AbstractAccessLogValve.java | 4 +--
.../org/apache/catalina/valves/AccessLogValve.java | 24 +++++++-------
.../catalina/valves/ExtendedAccessLogValve.java | 8 ++---
java/org/apache/coyote/AbstractProtocol.java | 12 +++----
java/org/apache/jasper/servlet/JspServlet.java | 10 +++---
java/org/apache/tomcat/util/net/NioEndpoint.java | 12 +++----
.../apache/tomcat/util/net/SocketWrapperBase.java | 6 ++--
14 files changed, 91 insertions(+), 85 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 6e7ca8fe19..7cf7020653 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -603,11 +603,11 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException",
wrapper.getName()),
StandardWrapper.getRootCause(e));
servletException = e;
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
-
wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException",
wrapper.getName()), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException",
wrapper.getName()), t);
servletException =
- new
ServletException(sm.getString("applicationDispatcher.allocateException",
wrapper.getName()), e);
+ new
ServletException(sm.getString("applicationDispatcher.allocateException",
wrapper.getName()), t);
// servlet = null; is already done so no need to do it explicitly
}
@@ -655,11 +655,11 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
} catch (ServletException e) {
wrapper.getLogger().error(sm.getString("applicationDispatcher.deallocateException",
wrapper.getName()), e);
servletException = e;
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
-
wrapper.getLogger().error(sm.getString("applicationDispatcher.deallocateException",
wrapper.getName()), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
wrapper.getLogger().error(sm.getString("applicationDispatcher.deallocateException",
wrapper.getName()), t);
servletException = new ServletException(
- sm.getString("applicationDispatcher.deallocateException",
wrapper.getName()), e);
+ sm.getString("applicationDispatcher.deallocateException",
wrapper.getName()), t);
}
// Reset the old context class loader
diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java
b/java/org/apache/catalina/core/ApplicationFilterChain.java
index 74119cbb69..8f5b5cfd99 100644
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -169,10 +169,10 @@ public final class ApplicationFilterChain implements
FilterChain {
}
} catch (IOException | ServletException | RuntimeException e) {
throw e;
- } catch (Throwable e) {
- e = ExceptionUtils.unwrapInvocationTargetException(e);
+ } catch (Throwable t) {
+ e = ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(e);
- throw new ServletException(sm.getString("filterChain.filter"),
e);
+ throw new ServletException(sm.getString("filterChain.filter"),
t);
}
return;
}
@@ -200,10 +200,16 @@ public final class ApplicationFilterChain implements
FilterChain {
}
} catch (IOException | ServletException | RuntimeException e) {
throw e;
+<<<<<<< HEAD
} catch (Throwable e) {
e = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(e);
throw new ServletException(sm.getString("filterChain.servlet"), e);
+=======
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ throw new ServletException(sm.getString("filterChain.servlet"), t);
+>>>>>>> 99ceef12d3 (Code clean-up - no functional change. Use 't' for
throwable)
} finally {
if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
lastServicedRequest.set(null);
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 460e4b6749..e56074ba4a 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -754,12 +754,12 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
for (Future<Void> result : results) {
try {
result.get();
- } catch (Throwable e) {
- log.error(sm.getString("containerBase.threadedStartFailed"),
e);
+ } catch (Throwable t) {
+ log.error(sm.getString("containerBase.threadedStartFailed"),
t);
if (multiThrowable == null) {
multiThrowable = new MultiThrowable();
}
- multiThrowable.add(e);
+ multiThrowable.add(t);
}
}
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index 3b4104cfc1..e65126a3fb 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -713,9 +713,9 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
nInstances++;
} catch (ServletException e) {
throw e;
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- throw new
ServletException(sm.getString("standardWrapper.allocate"), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ throw new
ServletException(sm.getString("standardWrapper.allocate"), t);
}
} else {
try {
@@ -905,8 +905,8 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
unavailable(null);
// Restore the context ClassLoader
throw new
ServletException(sm.getString("standardWrapper.notServlet", servletClass), e);
- } catch (Throwable e) {
- Throwable throwable =
ExceptionUtils.unwrapInvocationTargetException(e);
+ } catch (Throwable t) {
+ Throwable throwable =
ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(throwable);
unavailable(null);
diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java
b/java/org/apache/catalina/core/StandardWrapperValve.java
index 5898437350..174e26b41a 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -123,11 +123,11 @@ final class StandardWrapperValve extends ValveBase {
StandardWrapper.getRootCause(e));
throwable = e;
exception(request, response, e);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
-
container.getLogger().error(sm.getString("standardWrapper.allocateException",
wrapper.getName()), e);
- throwable = e;
- exception(request, response, e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
container.getLogger().error(sm.getString("standardWrapper.allocateException",
wrapper.getName()), t);
+ throwable = t;
+ exception(request, response, t);
// servlet = null; is set here
}
@@ -204,12 +204,12 @@ final class StandardWrapperValve extends ValveBase {
}
throwable = e;
exception(request, response, e);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
container.getLogger()
- .error(sm.getString("standardWrapper.serviceException",
wrapper.getName(), context.getName()), e);
- throwable = e;
- exception(request, response, e);
+ .error(sm.getString("standardWrapper.serviceException",
wrapper.getName(), context.getName()), t);
+ throwable = t;
+ exception(request, response, t);
} finally {
// Release the filter chain (if any) for this request
if (filterChain != null) {
@@ -221,12 +221,12 @@ final class StandardWrapperValve extends ValveBase {
if (servlet != null) {
wrapper.deallocate(servlet);
}
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
-
container.getLogger().error(sm.getString("standardWrapper.deallocateException",
wrapper.getName()), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
container.getLogger().error(sm.getString("standardWrapper.deallocateException",
wrapper.getName()), t);
if (throwable == null) {
- throwable = e;
- exception(request, response, e);
+ throwable = t;
+ exception(request, response, t);
}
}
@@ -236,11 +236,11 @@ final class StandardWrapperValve extends ValveBase {
if ((servlet != null) && (wrapper.getAvailable() ==
Long.MAX_VALUE)) {
wrapper.unload();
}
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
-
container.getLogger().error(sm.getString("standardWrapper.unloadException",
wrapper.getName()), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
container.getLogger().error(sm.getString("standardWrapper.unloadException",
wrapper.getName()), t);
if (throwable == null) {
- exception(request, response, e);
+ exception(request, response, t);
}
}
long t2 = System.currentTimeMillis();
diff --git a/java/org/apache/catalina/realm/JAASRealm.java
b/java/org/apache/catalina/realm/JAASRealm.java
index 89f4c2c0da..00941f3150 100644
--- a/java/org/apache/catalina/realm/JAASRealm.java
+++ b/java/org/apache/catalina/realm/JAASRealm.java
@@ -359,9 +359,9 @@ public class JAASRealm extends RealmBase {
try {
Configuration config = getConfig();
loginContext = new LoginContext(appName, null,
callbackHandler, config);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- log.error(sm.getString("jaasRealm.unexpectedError"), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("jaasRealm.unexpectedError"), t);
// There is configuration issue with JAAS so mark the realm as
// unavailable
invocationSuccess = false;
@@ -422,9 +422,9 @@ public class JAASRealm extends RealmBase {
// invocations so mark JAAS realm as available
invocationSuccess = true;
return null;
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- log.error(sm.getString("jaasRealm.unexpectedError"), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("jaasRealm.unexpectedError"), t);
// JAAS throws exception different from LoginException so mark
the
// realm as unavailable
invocationSuccess = false;
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index 9d9dcc55c6..8da828067e 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -223,10 +223,10 @@ public class UserDatabaseRealm extends RealmBase {
context = getServer().getGlobalNamingContext();
}
database = (UserDatabase) context.lookup(resourceName);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
if (containerLog != null) {
-
containerLog.error(sm.getString("userDatabaseRealm.lookup", resourceName), e);
+
containerLog.error(sm.getString("userDatabaseRealm.lookup", resourceName), t);
}
database = null;
}
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index c04d4f32eb..32aa5df0ee 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -784,8 +784,8 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
String init;
try {
init = InetAddress.getLocalHost().getHostAddress();
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
init = "127.0.0.1";
}
diff --git a/java/org/apache/catalina/valves/AccessLogValve.java
b/java/org/apache/catalina/valves/AccessLogValve.java
index fdaac8033b..b17ad782a3 100644
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -449,9 +449,9 @@ public class AccessLogValve extends AbstractAccessLogValve {
close(false);
try {
holder.renameTo(new File(newFileName));
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- log.error(sm.getString("accessLogValve.rotateFail"), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("accessLogValve.rotateFail"), t);
}
/* Make sure date is correct */
@@ -518,9 +518,9 @@ public class AccessLogValve extends AbstractAccessLogValve {
if (!rotatedLogFile.renameTo(newLogFile)) {
log.error(sm.getString("accessLogValve.renameFail",
rotatedLogFile, newLogFile));
}
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- log.error(sm.getString("accessLogValve.renameFail",
rotatedLogFile, newLogFile), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("accessLogValve.renameFail",
rotatedLogFile, newLogFile), t);
}
}
}
@@ -544,9 +544,9 @@ public class AccessLogValve extends AbstractAccessLogValve {
if (!currentLogFile.renameTo(newLogFile)) {
log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile));
}
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile), t);
}
} else {
log.error(sm.getString("accessLogValve.alreadyExists",
currentLogFile, newLogFile));
@@ -569,9 +569,9 @@ public class AccessLogValve extends AbstractAccessLogValve {
if (currentLogFile != null && !currentLogFile.exists()) {
try {
close(false);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- log.info(sm.getString("accessLogValve.closeFail"), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.info(sm.getString("accessLogValve.closeFail"), t);
}
/* Make sure date is correct */
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index eaa81901de..ba05a0ce6a 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -107,8 +107,8 @@ public class ExtendedAccessLogValve extends AccessLogValve {
try {
svalue = value.toString();
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
/* Log error */
buf.append('-');
return;
@@ -538,8 +538,8 @@ public class ExtendedAccessLogValve extends AccessLogValve {
String value;
try {
value = InetAddress.getLocalHost().getHostName();
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
value = "localhost";
}
buf.append(value);
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index e605a271c6..6ee5289d5e 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -1049,9 +1049,9 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
} finally {
try {
instanceManager.destroyInstance(httpUpgradeHandler);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
-
getLog().error(sm.getString("abstractConnectionHandler.error"), e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
getLog().error(sm.getString("abstractConnectionHandler.error"), t);
}
upgradeToken.getContextBind().unbind(false,
oldCL);
}
@@ -1086,12 +1086,12 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
// Worst case, it isn't recoverable and the attempt at logging
// will trigger another OOME.
getLog().error(sm.getString("abstractConnectionHandler.oome"),
oome);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
// any other exception or error is odd. Here we log it
// with "ERROR" level, so it will show up even on
// less-than-verbose logs.
-
getLog().error(sm.getString("abstractConnectionHandler.error"), e);
+
getLog().error(sm.getString("abstractConnectionHandler.error"), t);
}
// Make sure socket/processor is removed from the list of current
diff --git a/java/org/apache/jasper/servlet/JspServlet.java
b/java/org/apache/jasper/servlet/JspServlet.java
index 3adc6d1c46..c842fbe018 100644
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -95,8 +95,8 @@ public class JspServlet extends HttpServlet implements
PeriodicEventListener {
Constructor<?> ctor =
engineOptionsClass.getConstructor(ctorSig);
Object[] args = { config, context };
options = (Options) ctor.newInstance(args);
- } catch (Throwable e) {
- Throwable throwable =
ExceptionUtils.unwrapInvocationTargetException(e);
+ } catch (Throwable t) {
+ Throwable throwable =
ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(throwable);
// Need to localize this.
log.warn(Localizer.getMessage("jsp.warning.engineOptionsClass",
engineOptionsName), throwable);
@@ -307,9 +307,9 @@ public class JspServlet extends HttpServlet implements
PeriodicEventListener {
serviceJspFile(request, response, jspUri, precompile);
} catch (RuntimeException | IOException | ServletException e) {
throw e;
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
- throw new ServletException(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ throw new ServletException(t);
}
}
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index dc211dfd03..9d5cb920f3 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1308,10 +1308,10 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
getSocket().free();
}
}
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
if (log.isDebugEnabled()) {
- log.error(sm.getString("endpoint.debug.channelCloseFail"),
e);
+ log.error(sm.getString("endpoint.debug.channelCloseFail"),
t);
}
} finally {
socketBufferHandler = SocketBufferHandler.EMPTY;
@@ -1323,10 +1323,10 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel,SocketChannel>
if (data != null && data.fchannel != null &&
data.fchannel.isOpen()) {
data.fchannel.close();
}
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
if (log.isDebugEnabled()) {
- log.error(sm.getString("endpoint.sendfile.closeError"), e);
+ log.error(sm.getString("endpoint.sendfile.closeError"), t);
}
}
}
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 6ebcbc41de..c433992ed6 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -446,10 +446,10 @@ public abstract class SocketWrapperBase<E> {
if (closed.compareAndSet(false, true)) {
try {
getEndpoint().getHandler().release(this);
- } catch (Throwable e) {
- ExceptionUtils.handleThrowable(e);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
if (log.isDebugEnabled()) {
- log.error(sm.getString("endpoint.debug.handlerRelease"),
e);
+ log.error(sm.getString("endpoint.debug.handlerRelease"),
t);
}
} finally {
getEndpoint().countDownConnection();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
