This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 27fd3589aa Remove unnecessary casts
27fd3589aa is described below
commit 27fd3589aa5a60b78de22d61a30913f465c11756
Author: Mark Thomas <[email protected]>
AuthorDate: Sun Dec 15 12:57:52 2024 +0000
Remove unnecessary casts
---
java/org/apache/catalina/startup/HostConfig.java | 2 +-
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 2 +-
.../org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java | 4 +---
test/org/apache/catalina/valves/TestRequestFilterValve.java | 10 +++++-----
.../WEB-INF/classes/compressionFilters/CompressionFilter.java | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 8377e575c0..93cc9f4d30 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1691,7 +1691,7 @@ public class HostConfig implements LifecycleListener {
*/
public void check(String name) {
synchronized (host) {
- if (!((Lifecycle) host).getState().isAvailable()) {
+ if (!host.getState().isAvailable()) {
return;
}
if (tryAddServiced(name)) {
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 0c3cbad675..9067d0e7a4 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -1699,7 +1699,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint<Nio2Channel,AsynchronousS
} catch (Throwable t) {
log.error(sm.getString("endpoint.processing.fail"), t);
if (socketWrapper != null) {
- ((Nio2SocketWrapper) socketWrapper).close();
+ socketWrapper.close();
}
} finally {
if (launch) {
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
index 44d184943d..c67302e9ee 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
@@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit;
import org.junit.Test;
-import org.apache.tomcat.jdbc.pool.DataSourceProxy;
-
public class Async0IdleTestBug50477 extends DefaultTestCase {
@Test
@@ -33,7 +31,7 @@ public class Async0IdleTestBug50477 extends DefaultTestCase {
this.datasource.getPoolProperties().setFairQueue(true);
this.datasource.getPoolProperties().setInitialSize(0);
try {
- Future<Connection> cf =
((DataSourceProxy)datasource).getConnectionAsync();
+ Future<Connection> cf = datasource.getConnectionAsync();
cf.get(5, TimeUnit.SECONDS);
}finally {
tearDown();
diff --git a/test/org/apache/catalina/valves/TestRequestFilterValve.java
b/test/org/apache/catalina/valves/TestRequestFilterValve.java
index 2deb7db5a4..da1764b5dc 100644
--- a/test/org/apache/catalina/valves/TestRequestFilterValve.java
+++ b/test/org/apache/catalina/valves/TestRequestFilterValve.java
@@ -125,7 +125,7 @@ public class TestRequestFilterValve {
if (usePeerAddress) {
request.setRemoteAddr(ADDR_OTHER);
request.getCoyoteRequest().peerAddr().setString(property);
- ((RemoteAddrValve) valve).setUsePeerAddress(true);
+ valve.setUsePeerAddress(true);
msg.append(" peer='" + property + "'");
} else {
request.setRemoteAddr(property);
@@ -141,7 +141,7 @@ public class TestRequestFilterValve {
if (usePeerAddress) {
request.setRemoteAddr(ADDR_OTHER);
request.getCoyoteRequest().peerAddr().setString(property);
- ((RemoteCIDRValve) valve).setUsePeerAddress(true);
+ valve.setUsePeerAddress(true);
msg.append(" peer='" + property + "'");
} else {
request.setRemoteAddr(property);
@@ -170,11 +170,11 @@ public class TestRequestFilterValve {
}
if (addConnectorPort) {
if (valve instanceof RemoteAddrValve) {
- ((RemoteAddrValve) valve).setAddConnectorPort(true);
+ valve.setAddConnectorPort(true);
} else if (valve instanceof RemoteHostValve) {
- ((RemoteHostValve) valve).setAddConnectorPort(true);
+ valve.setAddConnectorPort(true);
} else if (valve instanceof RemoteCIDRValve) {
- ((RemoteCIDRValve) valve).setAddConnectorPort(true);
+ valve.setAddConnectorPort(true);
} else {
Assert.fail("Can only set 'addConnectorPort' for
RemoteAddrValve, RemoteHostValve and RemoteCIDRValve");
}
diff --git
a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
index 5ac0054a30..53f679d86a 100644
--- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
+++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
@@ -168,7 +168,7 @@ public class CompressionFilter extends GenericFilter {
}
// Are we allowed to compress ?
- String s = ((HttpServletRequest)request).getParameter("gzip");
+ String s = request.getParameter("gzip");
if ("false".equals(s)) {
if (debug > 0) {
System.out.println("got parameter gzip=false --> don't
compress, just chain filter");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
