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
commit 37fbd31107dd9d3e9d1cc41189f98e2246a7efd9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Dec 15 13:13:43 2024 +0000
Fix IDE warnings for unused code
---
java/org/apache/catalina/startup/ExpandWar.java | 3 ++-
java/org/apache/jasper/servlet/JspCServletContext.java | 3 ++-
.../src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java | 3 ++-
.../java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java | 6 ++++--
.../src/test/java/org/apache/tomcat/jdbc/test/TestException.java | 3 ++-
test/org/apache/tomcat/util/net/TestXxxEndpoint.java | 6 ++++--
6 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/startup/ExpandWar.java
b/java/org/apache/catalina/startup/ExpandWar.java
index fe720968a9..dfda875567 100644
--- a/java/org/apache/catalina/startup/ExpandWar.java
+++ b/java/org/apache/catalina/startup/ExpandWar.java
@@ -83,7 +83,8 @@ public class ExpandWar {
File warTracker = new File(host.getAppBaseFile(), pathname +
Constants.WarTracker);
long warLastModified = -1;
- try (InputStream is = jfuc.getInputStream()) {
+ try (@SuppressWarnings("unused")
+ InputStream is = jfuc.getInputStream()) {
// Get the last modified time for the WAR
warLastModified = jfuc.getLastModified();
}
diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java
b/java/org/apache/jasper/servlet/JspCServletContext.java
index 61e80d855d..c04a8c37eb 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -334,7 +334,8 @@ public class JspCServletContext implements ServletContext {
try {
URI uri = new URI(myResourceBaseURL.toExternalForm() + path);
url = uri.toURL();
- try (InputStream is = url.openStream()) {
+ try (@SuppressWarnings("unused")
+ InputStream is = url.openStream()) {
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
index be0c6c4312..49d5142cfe 100644
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug53367.java
@@ -108,7 +108,8 @@ public class Bug53367 {
@Override
public void run() {
// Expected to fail
- try (Connection c = ds.getConnection()) {
+ try (@SuppressWarnings("unused")
+ Connection c = ds.getConnection()) {
} catch (Exception e) {
System.err.println("Step 2:"+e.getMessage());
}
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
index 1e320dfeff..4cfdff2174 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
@@ -34,7 +34,8 @@ public class AbandonPercentageTest extends DefaultTestCase {
this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(100);
this.datasource.getPoolProperties().setRemoveAbandoned(true);
this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
- try (Connection con = datasource.getConnection()) {
+ try (@SuppressWarnings("unused")
+ Connection con = datasource.getConnection()) {
Assert.assertEquals("Number of connections active/busy should be
1",1,datasource.getPool().getActive());
Thread.sleep(2000);
Assert.assertEquals("Number of connections active/busy should be
0",0,datasource.getPool().getActive());
@@ -51,7 +52,8 @@ public class AbandonPercentageTest extends DefaultTestCase {
this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(100);
this.datasource.getPoolProperties().setRemoveAbandoned(true);
this.datasource.getPoolProperties().setRemoveAbandonedTimeout(1);
- try (Connection con = datasource.getConnection()) {
+ try (@SuppressWarnings("unused")
+ Connection con = datasource.getConnection()) {
Assert.assertEquals("Number of connections active/busy should be
1",1,datasource.getPool().getActive());
Thread.sleep(2000);
Assert.assertEquals("Number of connections active/busy should be
1",1,datasource.getPool().getActive());
diff --git
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
index fe4d20d76e..3874ccd3ab 100644
---
a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
+++
b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
@@ -32,7 +32,8 @@ public class TestException extends DefaultTestCase {
public void testException() throws Exception {
datasource.getPoolProperties().setJdbcInterceptors(TestInterceptor.class.getName());
Connection con = datasource.getConnection();
- try (Statement s = con.createStatement()){
+ try (@SuppressWarnings("unused")
+ Statement s = con.createStatement()){
} catch (Exception x) {
Assert.fail();
}
diff --git a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
index 30c564c137..1ea8937d7a 100644
--- a/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
+++ b/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
@@ -50,7 +50,8 @@ public class TestXxxEndpoint extends TomcatBaseTest {
tomcat.getConnector().stop();
Exception e = null;
- try (ServerSocket s = new ServerSocket(port, 100,
InetAddress.getByName("localhost"))){
+ try (@SuppressWarnings("unused")
+ ServerSocket s = new ServerSocket(port, 100,
InetAddress.getByName("localhost"))){
} catch (Exception e1) {
e = e1;
}
@@ -76,7 +77,8 @@ public class TestXxxEndpoint extends TomcatBaseTest {
tomcat.getConnector().stop();
Exception e = null;
- try (ServerSocket s = new ServerSocket(port, 100,
InetAddress.getByName("localhost"))) {
+ try (@SuppressWarnings("unused")
+ ServerSocket s = new ServerSocket(port, 100,
InetAddress.getByName("localhost"))) {
// This should not throw an Exception
} catch (Exception e1) {
e = e1;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
