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 b60d60021e Rename some exceptions
b60d60021e is described below
commit b60d60021e384b4f220a030484115df406529c24
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Aug 20 14:34:08 2025 +0100
Rename some exceptions
Not complete.
---
java/javax/el/ExpressionFactory.java | 6 +++---
java/org/apache/catalina/startup/HostConfig.java | 2 +-
.../catalina/webresources/AbstractFileResourceSet.java | 4 ++--
java/org/apache/coyote/AbstractProcessor.java | 18 +++++++++---------
java/org/apache/coyote/http11/Http11Processor.java | 18 +++++++++---------
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/java/javax/el/ExpressionFactory.java
b/java/javax/el/ExpressionFactory.java
index c8fb87b1e6..f2aac0cc88 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -359,8 +359,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;
@@ -374,4 +374,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 358ccaf1c7..269b4b22f9 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -439,7 +439,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 fef62fc5f8..54f48da28f 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 0389c01b36..3b8164eb46 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;
}
diff --git a/java/org/apache/coyote/http11/Http11Processor.java
b/java/org/apache/coyote/http11/Http11Processor.java
index ab0ff058dd..6eb8e36e93 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -301,11 +301,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);
@@ -1200,8 +1200,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
@@ -1216,8 +1216,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);
@@ -1251,8 +1251,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: [email protected]
For additional commands, e-mail: [email protected]
