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
The following commit(s) were added to refs/heads/main by this push:
new b3bb9226d5 Remaining IOException variable rename to ioe
b3bb9226d5 is described below
commit b3bb9226d55839a4fb81430c1338741268246670
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Aug 20 15:37:44 2025 +0100
Remaining IOException variable rename to ioe
---
.../apache/tomcat/jdbc/pool/PoolProperties.java | 4 +--
.../http/TestHttpServletResponseSendError.java | 4 +--
test/org/apache/catalina/ant/TestDeployTask.java | 6 ++--
.../apache/catalina/connector/TestSendFile.java | 4 +--
.../apache/catalina/core/TestAsyncContextImpl.java | 12 +++----
.../core/TestAsyncContextStateChanges.java | 4 +--
.../catalina/core/TestSwallowAbortedUploads.java | 4 +--
test/org/apache/catalina/loader/EchoTag.java | 4 +--
.../catalina/nonblocking/TestNonBlockingAPI.java | 16 ++++-----
.../apache/catalina/realm/TesterLoginModule.java | 4 +--
test/org/apache/catalina/session/Benchmarks.java | 4 +--
.../catalina/startup/TestWebappServiceLoader.java | 8 ++---
.../apache/catalina/valves/TestAccessLogValve.java | 8 ++---
.../valves/TestExtendedAccessLogValve.java | 4 +--
.../valves/TestStuckThreadDetectionValve.java | 8 ++---
.../apache/coyote/http11/TestHttp11Processor.java | 2 +-
test/org/apache/coyote/http2/TestAsync.java | 4 +--
.../apache/coyote/http2/TestHttp2AccessLogs.java | 4 +--
test/org/apache/coyote/http2/TestHttp2Limits.java | 2 +-
.../apache/coyote/http2/TestHttp2Section_3_5.java | 2 +-
test/org/apache/jasper/compiler/TestGenerator.java | 14 ++++----
test/org/apache/jasper/compiler/TestValidator.java | 4 +--
test/org/apache/tomcat/util/net/TestSsl.java | 2 +-
.../util/net/openssl/ciphers/TesterOpenSSL.java | 4 +--
.../websocket/TestWsSessionSuspendResume.java | 6 ++--
.../apache/tomcat/websocket/TesterEchoServer.java | 40 +++++++++++-----------
.../tomcat/websocket/TesterWsClientAutobahn.java | 8 ++---
27 files changed, 94 insertions(+), 92 deletions(-)
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
index 44bddba25b..1157a0ed7e 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
@@ -939,8 +939,8 @@ public class PoolProperties implements PoolConfiguration,
Cloneable, Serializabl
if (propText != null) {
try {
props.load(new ByteArrayInputStream(propText.replace(';',
'\n').getBytes()));
- }catch (IOException x) {
- throw new RuntimeException(x);
+ }catch (IOException ioe) {
+ throw new RuntimeException(ioe);
}
}
return props;
diff --git a/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
b/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
index 94cd9dd0c1..e31d951e3c 100644
--- a/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
+++ b/test/jakarta/servlet/http/TestHttpServletResponseSendError.java
@@ -290,8 +290,8 @@ public class TestHttpServletResponseSendError extends
TomcatBaseTest {
// reported
try {
((HttpServletResponse) ac.getResponse()).sendError(599);
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
diff --git a/test/org/apache/catalina/ant/TestDeployTask.java
b/test/org/apache/catalina/ant/TestDeployTask.java
index 0441d01284..a078ea5ef1 100644
--- a/test/org/apache/catalina/ant/TestDeployTask.java
+++ b/test/org/apache/catalina/ant/TestDeployTask.java
@@ -40,7 +40,8 @@ public class TestDeployTask extends TomcatBaseTest {
Assert.assertEquals("application/octet-stream", contentType);
try {
istream.close();
- } catch (IOException e) {
+ } catch (IOException ignore) {
+ // Ignore
}
}
@@ -99,7 +100,8 @@ public class TestDeployTask extends TomcatBaseTest {
Assert.assertEquals("application/octet-stream", contentType);
try {
istream.close();
- } catch (IOException e) {
+ } catch (IOException ignore) {
+ // Ignore
}
}
diff --git a/test/org/apache/catalina/connector/TestSendFile.java
b/test/org/apache/catalina/connector/TestSendFile.java
index 098ff0aa53..a195b78bbb 100644
--- a/test/org/apache/catalina/connector/TestSendFile.java
+++ b/test/org/apache/catalina/connector/TestSendFile.java
@@ -166,9 +166,9 @@ public class TestSendFile extends TomcatBaseTest {
try {
getUrl("http://localhost:"; + getPort() + "/test/?" +
Globals.SENDFILE_SUPPORTED_ATTR
+ "=true", bc, null);
- } catch (IOException e) {
+ } catch (IOException ioe) {
// Ignore possible IOE due to file delete on the server
- System.out.println("Ignored: " + e.getMessage());
+ System.out.println("Ignored: " + ioe.getMessage());
}
CountDownLatch latch = new CountDownLatch(2);
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 8050f13ab3..2542a72573 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -1457,7 +1457,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
try {
resp.sendError(status, ERROR_MESSAGE);
actxt.complete();
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -2379,8 +2379,8 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
public void run() {
try {
getUrl("http://localhost:"; + getPort() +
"/asyncStashServlet");
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
});
@@ -3017,7 +3017,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
resp.getWriter().write(TestCoyoteAdapter.TEXT_8K);
resp.flushBuffer();
}
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Ignore
}
ise.set(false);
@@ -3203,8 +3203,8 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
// Read again
try {
is.read();
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
// Required. Clear the error marker.
testFailed.set(false);
}
diff --git a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
index 0d8c7dc8a5..df486393c1 100644
--- a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
+++ b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
@@ -237,8 +237,8 @@ public class TestAsyncContextStateChanges extends
TomcatBaseTest {
for (int i = 0; i < 64; i++) {
os.write(TestCoyoteAdapter.TEXT_8K.getBytes(StandardCharsets.UTF_8));
}
- } catch (IOException e) {
- // Expected
+ } catch (IOException ignore) {
+ // Ignore - The test intends to trigger the IOE
}
}
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index 385bfbaa52..5313f6db40 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -468,8 +468,8 @@ public class TestSwallowAbortedUploads extends
TomcatBaseTest {
conn.getInputStream(), StandardCharsets.US_ASCII));
responseLine = reader.readLine();
- } catch (IOException e) {
- readEx = e;
+ } catch (IOException ioe) {
+ readEx = ioe;
}
}
diff --git a/test/org/apache/catalina/loader/EchoTag.java
b/test/org/apache/catalina/loader/EchoTag.java
index 266751157b..f8e8cbbe8a 100644
--- a/test/org/apache/catalina/loader/EchoTag.java
+++ b/test/org/apache/catalina/loader/EchoTag.java
@@ -38,8 +38,8 @@ public class EchoTag extends TagSupport {
public int doStartTag() throws JspException {
try {
pageContext.getOut().print("<p>" + echo + "</p>");
- } catch (IOException e) {
- throw new JspException(e);
+ } catch (IOException ioe) {
+ throw new JspException(ioe);
}
return super.doStartTag();
}
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 53832b24e4..3ee6bfa9e2 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1211,8 +1211,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
if (isReady) {
onDataAvailable();
}
- } catch (IOException e) {
- onError(e);
+ } catch (IOException ioe) {
+ onError(ioe);
}
}
}.start();
@@ -1574,8 +1574,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
public void run() {
try {
setListeners();
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
@@ -1596,8 +1596,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
String body = new String(buffer,
StandardCharsets.UTF_8);
Assert.assertTrue(body.equals("body"));
- } catch (IOException ex) {
- ex.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
@@ -1736,8 +1736,8 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
is.read(buffer);
}
- } catch (IOException ex) {
- ex.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
diff --git a/test/org/apache/catalina/realm/TesterLoginModule.java
b/test/org/apache/catalina/realm/TesterLoginModule.java
index 92889968e4..02f941cfe8 100644
--- a/test/org/apache/catalina/realm/TesterLoginModule.java
+++ b/test/org/apache/catalina/realm/TesterLoginModule.java
@@ -119,8 +119,8 @@ public class TesterLoginModule implements LoginModule {
return true;
- } catch (IOException e) {
- throw new LoginException(e.getMessage());
+ } catch (IOException ioe) {
+ throw new LoginException(ioe.getMessage());
} catch (UnsupportedCallbackException e) {
throw new LoginException(e.getMessage());
}
diff --git a/test/org/apache/catalina/session/Benchmarks.java
b/test/org/apache/catalina/session/Benchmarks.java
index f11430890c..ff5e120594 100644
--- a/test/org/apache/catalina/session/Benchmarks.java
+++ b/test/org/apache/catalina/session/Benchmarks.java
@@ -353,8 +353,8 @@ public class Benchmarks {
throw new IOException("Only read " + read + " bytes");
}
}
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
}
diff --git a/test/org/apache/catalina/startup/TestWebappServiceLoader.java
b/test/org/apache/catalina/startup/TestWebappServiceLoader.java
index 87bf2d8674..e7fe0e7269 100644
--- a/test/org/apache/catalina/startup/TestWebappServiceLoader.java
+++ b/test/org/apache/catalina/startup/TestWebappServiceLoader.java
@@ -165,8 +165,8 @@ public class TestWebappServiceLoader {
control.replay();
try {
loader.loadServices(ServletContainerInitializer.class, names);
- } catch (IOException e) {
- assertThat(e.getCause(), instanceOf(ClassCastException.class));
+ } catch (IOException ioe) {
+ assertThat(ioe.getCause(), instanceOf(ClassCastException.class));
} finally {
control.verify();
}
@@ -184,8 +184,8 @@ public class TestWebappServiceLoader {
control.replay();
try {
loader.loadServices(ServletContainerInitializer.class, names);
- } catch (IOException e) {
- assertThat(e.getCause(),
instanceOf(ReflectiveOperationException.class));
+ } catch (IOException ioe) {
+ assertThat(ioe.getCause(),
instanceOf(ReflectiveOperationException.class));
} finally {
control.verify();
}
diff --git a/test/org/apache/catalina/valves/TestAccessLogValve.java
b/test/org/apache/catalina/valves/TestAccessLogValve.java
index 36dab721ec..da124a0631 100644
--- a/test/org/apache/catalina/valves/TestAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestAccessLogValve.java
@@ -212,8 +212,8 @@ public class TestAccessLogValve extends TomcatBaseTest {
public void log(CharArrayWriter message) {
try {
message.writeTo(writer);
- } catch (IOException ex) {
- log.error("Could not write to writer", ex);
+ } catch (IOException ioe) {
+ log.error("Could not write to writer", ioe);
}
}
}
@@ -233,8 +233,8 @@ public class TestAccessLogValve extends TomcatBaseTest {
public void log(CharArrayWriter message) {
try {
message.writeTo(writer);
- } catch (IOException ex) {
- log.error("Could not write to writer", ex);
+ } catch (IOException ioe) {
+ log.error("Could not write to writer", ioe);
}
}
}
diff --git a/test/org/apache/catalina/valves/TestExtendedAccessLogValve.java
b/test/org/apache/catalina/valves/TestExtendedAccessLogValve.java
index 9d2b426a70..bf71276c09 100644
--- a/test/org/apache/catalina/valves/TestExtendedAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestExtendedAccessLogValve.java
@@ -87,8 +87,8 @@ public class TestExtendedAccessLogValve extends
TomcatBaseTest {
public void log(CharArrayWriter message) {
try {
message.writeTo(writer);
- } catch (IOException ex) {
- log.error("Could not write to writer", ex);
+ } catch (IOException ioe) {
+ log.error("Could not write to writer", ioe);
}
}
}
diff --git a/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
b/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
index ae54e19421..5b1139b9d1 100644
--- a/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
+++ b/test/org/apache/catalina/valves/TestStuckThreadDetectionValve.java
@@ -68,8 +68,8 @@ public class TestStuckThreadDetectionValve extends
TomcatBaseTest {
public void run() {
try {
getUrl("http://localhost:"; + getPort() + "/myservlet",
result, null);
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
@@ -112,8 +112,8 @@ public class TestStuckThreadDetectionValve extends
TomcatBaseTest {
public void run() {
try {
getUrl("http://localhost:"; + getPort() + "/myservlet",
result, null);
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
diff --git a/test/org/apache/coyote/http11/TestHttp11Processor.java
b/test/org/apache/coyote/http11/TestHttp11Processor.java
index 09ff561a1e..954331729e 100644
--- a/test/org/apache/coyote/http11/TestHttp11Processor.java
+++ b/test/org/apache/coyote/http11/TestHttp11Processor.java
@@ -749,7 +749,7 @@ public class TestHttp11Processor extends TomcatBaseTest {
resp.setCharacterEncoding("UTF-8");
try {
resp.getWriter().print("OK");
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Should never happen. Test will fail if it does.
}
ac.complete();
diff --git a/test/org/apache/coyote/http2/TestAsync.java
b/test/org/apache/coyote/http2/TestAsync.java
index f15cc22731..9e4e41c801 100644
--- a/test/org/apache/coyote/http2/TestAsync.java
+++ b/test/org/apache/coyote/http2/TestAsync.java
@@ -239,8 +239,8 @@ public class TestAsync extends Http2TestBase {
public void run() {
try {
write();
- } catch (IOException e) {
- throw new IllegalStateException(e);
+ } catch (IOException ioe) {
+ throw new IllegalStateException(ioe);
}
}
}, 200, TimeUnit.MILLISECONDS);
diff --git a/test/org/apache/coyote/http2/TestHttp2AccessLogs.java
b/test/org/apache/coyote/http2/TestHttp2AccessLogs.java
index ef397d4166..e355ff72bc 100644
--- a/test/org/apache/coyote/http2/TestHttp2AccessLogs.java
+++ b/test/org/apache/coyote/http2/TestHttp2AccessLogs.java
@@ -147,8 +147,8 @@ public class TestHttp2AccessLogs extends Http2TestBase {
public void log(CharArrayWriter message) {
try {
message.writeTo(writer);
- } catch (IOException ex) {
- log.error("Could not write to writer", ex);
+ } catch (IOException ioe) {
+ log.error("Could not write to writer", ioe);
}
}
}
diff --git a/test/org/apache/coyote/http2/TestHttp2Limits.java
b/test/org/apache/coyote/http2/TestHttp2Limits.java
index 312e0c2289..e7435d57a0 100644
--- a/test/org/apache/coyote/http2/TestHttp2Limits.java
+++ b/test/org/apache/coyote/http2/TestHttp2Limits.java
@@ -312,7 +312,7 @@ public class TestHttp2Limits extends Http2TestBase {
parser.readFrame();
MatcherAssert.assertThat(output.getTrace(),
RegexMatcher.matchesRegex("0-Goaway-\\[1\\]-\\[11\\]-\\[" + limitMessage +
"\\]"));
- } catch (IOException se) {
+ } catch (IOException ignore) {
// Expected on some platforms
}
break;
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_3_5.java
b/test/org/apache/coyote/http2/TestHttp2Section_3_5.java
index 4f88571877..2053b41e81 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_3_5.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_3_5.java
@@ -47,7 +47,7 @@ public class TestHttp2Section_3_5 extends Http2TestBase {
// body will fail.
try {
sendPing();
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Ignore
}
diff --git a/test/org/apache/jasper/compiler/TestGenerator.java
b/test/org/apache/jasper/compiler/TestGenerator.java
index 17d088191b..8d62477c2f 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -246,8 +246,8 @@ public class TestGenerator extends TomcatBaseTest {
public int doEndTag() throws JspException {
try {
pageContext.getOut().print("attribute1: '" + attribute1 + "',
" + "attribute2: '" + attribute2 + "'");
- } catch (IOException e) {
- throw new JspException(e);
+ } catch (IOException ioe) {
+ throw new JspException(ioe);
}
return EVAL_PAGE;
}
@@ -262,11 +262,11 @@ public class TestGenerator extends TomcatBaseTest {
try {
getUrl("http://localhost:"; + getPort() +
"/test/bug5nnnn/bug56581.jsp", res, null);
Assert.fail("An IOException was expected.");
- } catch (IOException expected) {
- // ErrorReportValve in Tomcat 8.0.9+ flushes and aborts the
- // connection when an unexpected error is encountered and response
- // has already been committed. It results in an exception here:
- // java.io.IOException: Premature EOF
+ } catch (IOException ignore) {
+ /*
+ * ErrorReportValve flushes and aborts the connection when an
unexpected error is encountered and response
+ * has already been committed. It results in an exception here:
java.io.IOException: Premature EOF
+ */
}
String result = res.toString();
diff --git a/test/org/apache/jasper/compiler/TestValidator.java
b/test/org/apache/jasper/compiler/TestValidator.java
index d6ad22acd7..8e91cd73fa 100644
--- a/test/org/apache/jasper/compiler/TestValidator.java
+++ b/test/org/apache/jasper/compiler/TestValidator.java
@@ -322,8 +322,8 @@ public class TestValidator extends TomcatBaseTest {
public int doStartTag() throws JspException {
try {
pageContext.getOut().print("<p>" + echo + "</p>");
- } catch (IOException e) {
- pageContext.getServletContext().log("Tag (Echo21) failure", e);
+ } catch (IOException ioe) {
+ pageContext.getServletContext().log("Tag (Echo21) failure",
ioe);
}
return super.doStartTag();
}
diff --git a/test/org/apache/tomcat/util/net/TestSsl.java
b/test/org/apache/tomcat/util/net/TestSsl.java
index 925e0a403e..d17934876d 100644
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -332,7 +332,7 @@ public class TestSsl extends TomcatBaseTest {
if (!renegotiationSupported) {
Assert.fail("Renegotiation started when it should have
failed");
}
- } catch (IOException e) {
+ } catch (IOException ioe) {
if (renegotiationSupported) {
Assert.fail("Renegotiation failed when it should be
supported");
}
diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
index 70c66b4400..6ba6a0be36 100644
--- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
+++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
@@ -46,7 +46,7 @@ public class TesterOpenSSL {
String versionString = null;
try {
versionString = executeOpenSSLCommand("version");
- } catch (IOException e) {
+ } catch (IOException ioe) {
versionString = "";
}
if (versionString.startsWith("OpenSSL 3.6.")) {
@@ -392,7 +392,7 @@ public class TesterOpenSSL {
public void run() {
try {
IOTools.flow(is, baos);
- } catch (IOException e) {
+ } catch (IOException ignore) {
// Ignore
}
}
diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 6a8aad06d8..b4f7188ddf 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -108,8 +108,8 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
public void onClose(Session session, CloseReason closeReason) {
try {
session.close();
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
}
@@ -137,7 +137,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
session.getBasicRemote().sendText(messages.toString());
messages.clear();
((WsSession) session).resume();
- } catch (IOException e) {
+ } catch (IOException ioe) {
Assert.fail();
}
} else {
diff --git a/test/org/apache/tomcat/websocket/TesterEchoServer.java
b/test/org/apache/tomcat/websocket/TesterEchoServer.java
index 0c90d8b015..e3c415db7a 100644
--- a/test/org/apache/tomcat/websocket/TesterEchoServer.java
+++ b/test/org/apache/tomcat/websocket/TesterEchoServer.java
@@ -68,10 +68,10 @@ public class TesterEchoServer {
public void echoTextMessage(Session session, String msg, boolean last)
{
try {
session.getBasicRemote().sendText(msg, last);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -82,10 +82,10 @@ public class TesterEchoServer {
public void echoBinaryMessage(Session session, ByteBuffer msg, boolean
last) {
try {
session.getBasicRemote().sendBinary(msg, last);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -99,10 +99,10 @@ public class TesterEchoServer {
public void echoTextMessage(Session session, String msg) {
try {
session.getBasicRemote().sendText(msg);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -113,10 +113,10 @@ public class TesterEchoServer {
public void echoBinaryMessage(Session session, ByteBuffer msg) {
try {
session.getBasicRemote().sendBinary(msg);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -133,10 +133,10 @@ public class TesterEchoServer {
public void echoTextMessage(Session session, String msg) {
try {
session.getBasicRemote().sendText(msg);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -147,10 +147,10 @@ public class TesterEchoServer {
public void echoBinaryMessage(Session session, ByteBuffer msg) {
try {
session.getBasicRemote().sendBinary(msg);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -167,10 +167,10 @@ public class TesterEchoServer {
public void echoTextMessage(Session session, String msg) {
try {
session.getBasicRemote().sendText(msg);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -181,10 +181,10 @@ public class TesterEchoServer {
public void echoBinaryMessage(Session session, ByteBuffer msg) {
try {
session.getBasicRemote().sendBinary(msg);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -228,11 +228,11 @@ public class TesterEchoServer {
// Default is echo
w.write(msg);
}
- } catch (IOException e) {
+ } catch (IOException ioe) {
// Should not happen
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -252,10 +252,10 @@ public class TesterEchoServer {
public void echoTextMessage(Session session, String msg) {
try {
session.getBasicRemote().sendText(msg);
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
diff --git a/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
b/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
index 78259ebf56..62c6220e75 100644
--- a/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
+++ b/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
@@ -153,10 +153,10 @@ public class TesterWsClientAutobahn {
if (session.isOpen()) {
session.getBasicRemote().sendText(msg, last);
}
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
@@ -168,10 +168,10 @@ public class TesterWsClientAutobahn {
if (session.isOpen()) {
session.getBasicRemote().sendBinary(bb, last);
}
- } catch (IOException e) {
+ } catch (IOException ioe) {
try {
session.close();
- } catch (IOException e1) {
+ } catch (IOException ignore) {
// Ignore
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
