This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new f318ff6287 Rename some exceptions
f318ff6287 is described below
commit f318ff62873dab70ef1db833883dfd8043a60e2b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Aug 20 14:34:08 2025 +0100
Rename some exceptions
Not complete.
---
java/jakarta/el/ExpressionFactory.java | 6 +++---
java/org/apache/catalina/startup/HostConfig.java | 2 +-
.../webresources/AbstractFileResourceSet.java | 4 ++--
java/org/apache/coyote/AbstractProcessor.java | 22 +++++++++++-----------
java/org/apache/coyote/http11/Http11Processor.java | 18 +++++++++---------
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/java/jakarta/el/ExpressionFactory.java
b/java/jakarta/el/ExpressionFactory.java
index bd48c822da..bda510cea1 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -336,8 +336,8 @@ public abstract class ExpressionFactory {
}
} catch (FileNotFoundException e) {
// Should not happen - ignore it if it does
- } catch (IOException e) {
- throw new ELException(Util.message(null,
"expressionFactory.readFailed", PROPERTY_FILE), e);
+ } catch (IOException ioe) {
+ throw new ELException(Util.message(null,
"expressionFactory.readFailed", PROPERTY_FILE), ioe);
}
}
return null;
@@ -351,4 +351,4 @@ public abstract class ExpressionFactory {
return null;
}
-}
+}
\ No newline at end of file
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 470e521dc5..0455895c1a 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -350,7 +350,7 @@ public class HostConfig implements LifecycleListener {
}
try {
return file.getCanonicalFile();
- } catch (IOException e) {
+ } catch (IOException ioe) {
return file;
}
}
diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 7f5955d05c..ef96a0c7c8 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -106,7 +106,7 @@ public abstract class AbstractFileResourceSet extends
AbstractResourceSet {
String canPath = null;
try {
canPath = file.getCanonicalPath();
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Ignore
}
if (canPath == null || !canPath.startsWith(canonicalBase)) {
@@ -256,4 +256,4 @@ public abstract class AbstractFileResourceSet extends
AbstractResourceSet {
protected abstract void checkType(File file);
-}
+}
\ No newline at end of file
diff --git a/java/org/apache/coyote/AbstractProcessor.java
b/java/org/apache/coyote/AbstractProcessor.java
index e493d16764..df51a4ee87 100644
--- a/java/org/apache/coyote/AbstractProcessor.java
+++ b/java/org/apache/coyote/AbstractProcessor.java
@@ -374,8 +374,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
try {
// Validate and write response headers
prepareResponse();
- } catch (IOException e) {
- handleIOException(e);
+ } catch (IOException ioe) {
+ handleIOException(ioe);
}
}
break;
@@ -384,8 +384,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
action(ActionCode.COMMIT, null);
try {
finishResponse();
- } catch (IOException e) {
- handleIOException(e);
+ } catch (IOException ioe) {
+ handleIOException(ioe);
}
break;
}
@@ -396,8 +396,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
case EARLY_HINTS: {
try {
earlyHints();
- } catch (IOException e) {
- handleIOException(e);
+ } catch (IOException ioe) {
+ handleIOException(ioe);
}
break;
}
@@ -405,9 +405,9 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
action(ActionCode.COMMIT, null);
try {
flush();
- } catch (IOException e) {
- handleIOException(e);
- response.setErrorException(e);
+ } catch (IOException ioe) {
+ handleIOException(ioe);
+ response.setErrorException(ioe);
}
break;
}
@@ -575,8 +575,8 @@ public abstract class AbstractProcessor extends
AbstractProcessorLight implement
case ASYNC_POST_PROCESS: {
try {
asyncStateMachine.asyncPostProcess();
- } catch (IOException e) {
- handleIOException(e);
+ } catch (IOException ioe) {
+ handleIOException(ioe);
}
break;
}
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index fbdb32bc22..a40db16f6e 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -300,11 +300,11 @@ public class Http11Processor extends AbstractProcessor {
socketWrapper.setReadTimeout(protocol.getConnectionUploadTimeout());
}
}
- } catch (IOException e) {
+ } catch (IOException ioe) {
if (log.isDebugEnabled()) {
- log.debug(sm.getString("http11processor.header.parse"), e);
+ log.debug(sm.getString("http11processor.header.parse"),
ioe);
}
- setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
break;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -1194,8 +1194,8 @@ public class Http11Processor extends AbstractProcessor {
if (getErrorState().isIoAllowed()) {
try {
inputBuffer.endRequest();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ } catch (IOException ioe) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
// 500 - Internal Server Error
@@ -1210,8 +1210,8 @@ public class Http11Processor extends AbstractProcessor {
try {
action(ActionCode.COMMIT, null);
outputBuffer.end();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ } catch (IOException ioe) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
setErrorState(ErrorState.CLOSE_NOW, t);
@@ -1239,8 +1239,8 @@ public class Http11Processor extends AbstractProcessor {
if (!response.isCommitted() && request.hasExpectation()) {
try {
outputBuffer.sendAck();
- } catch (IOException e) {
- setErrorState(ErrorState.CLOSE_CONNECTION_NOW, e);
+ } catch (IOException ioe) {
+ setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
