Author: ebourg
Date: Tue May 9 12:33:07 2017
New Revision: 1794554
URL: http://svn.apache.org/viewvc?rev=1794554&view=rev
Log:
Removed unnecessary semicolons
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Tue May
9 12:33:07 2017
@@ -211,7 +211,7 @@ public abstract class AbstractCatalinaTa
// Send the request data (if any)
if (istream != null) {
try (BufferedOutputStream ostream = new BufferedOutputStream(
- hconn.getOutputStream(), 1024);) {
+ hconn.getOutputStream(), 1024)) {
byte buffer[] = new byte[1024];
while (true) {
int n = istream.read(buffer);
Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Tue May 9
12:33:07 2017
@@ -93,7 +93,7 @@ public class ValidatorTask extends BaseR
// SecurityManager assume that untrusted applications may be deployed.
Digester digester = DigesterFactory.newDigester(
true, true, null, Globals.IS_SECURITY_ENABLED);
- try (InputStream stream = new BufferedInputStream(new
FileInputStream(file.getCanonicalFile()));) {
+ try (InputStream stream = new BufferedInputStream(new
FileInputStream(file.getCanonicalFile()))) {
InputSource is = new
InputSource(file.toURI().toURL().toExternalForm());
is.setByteStream(stream);
digester.parse(is);
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Tue
May 9 12:33:07 2017
@@ -748,7 +748,7 @@ public class FarmWarDeployer extends Clu
}
try (java.io.FileInputStream is = new java.io.FileInputStream(from);
- java.io.FileOutputStream os = new java.io.FileOutputStream(to,
false);) {
+ java.io.FileOutputStream os = new java.io.FileOutputStream(to,
false)) {
byte[] buf = new byte[4096];
while (true) {
int len = is.read(buf);
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue May
9 12:33:07 2017
@@ -601,7 +601,7 @@ public class DefaultServlet extends Http
}
try (RandomAccessFile randAccessContentFile =
- new RandomAccessFile(contentFile, "rw");) {
+ new RandomAccessFile(contentFile, "rw")) {
WebResource oldResource = resources.getResource(path);
@@ -609,7 +609,7 @@ public class DefaultServlet extends Http
if (oldResource.isFile()) {
try (BufferedInputStream bufOldRevStream =
new BufferedInputStream(oldResource.getInputStream(),
- BUFFER_SIZE);) {
+ BUFFER_SIZE)) {
int numBytesRead;
byte[] copyBuffer = new byte[BUFFER_SIZE];
@@ -627,7 +627,7 @@ public class DefaultServlet extends Http
int numBytesRead;
byte[] transferBuffer = new byte[BUFFER_SIZE];
try (BufferedInputStream requestBufInStream =
- new BufferedInputStream(req.getInputStream(), BUFFER_SIZE);) {
+ new BufferedInputStream(req.getInputStream(), BUFFER_SIZE)) {
while ((numBytesRead =
requestBufInStream.read(transferBuffer)) != -1) {
randAccessContentFile.write(transferBuffer, 0,
numBytesRead);
}
@@ -1718,7 +1718,7 @@ public class DefaultServlet extends Http
if (resource.isFile()) {
StringWriter buffer = new StringWriter();
InputStreamReader reader = null;
- try (InputStream is = resource.getInputStream();){
+ try (InputStream is = resource.getInputStream()){
if (encoding != null) {
reader = new InputStreamReader(is, encoding);
} else {
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Tue
May 9 12:33:07 2017
@@ -163,7 +163,7 @@ public class WebappServiceLoader<T> {
throws IOException {
try (InputStream is = url.openStream();
InputStreamReader in = new InputStreamReader(is,
StandardCharsets.UTF_8);
- BufferedReader reader = new BufferedReader(in);) {
+ BufferedReader reader = new BufferedReader(in)) {
String line;
while ((line = reader.readLine()) != null) {
int i = line.indexOf('#');
Modified:
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Tue May 9 12:33:07 2017
@@ -420,6 +420,6 @@ public class StuckThreadDetectionValve e
}
private enum MonitoredThreadState {
- RUNNING, STUCK, DONE;
+ RUNNING, STUCK, DONE
}
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Tue May 9
12:33:07 2017
@@ -420,7 +420,7 @@ public class JDTCompiler extends org.apa
classFileName.append(".class");
try (FileOutputStream fout = new
FileOutputStream(
classFileName.toString());
- BufferedOutputStream bos = new
BufferedOutputStream(fout);) {
+ BufferedOutputStream bos = new
BufferedOutputStream(fout)) {
bos.write(bytes);
}
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Tue May
9 12:33:07 2017
@@ -238,7 +238,7 @@ class ParserController implements TagCon
} else {
// Standard syntax
try (InputStreamReader inStreamReader = JspUtil.getReader(
- absFileName, sourceEnc, jar, ctxt, err, skip);) {
+ absFileName, sourceEnc, jar, ctxt, err, skip)) {
JspReader jspReader = new JspReader(ctxt, absFileName,
inStreamReader, err);
parsedPage = Parser.parse(this, jspReader, parent, isTagFile,
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Tue May 9
12:33:07 2017
@@ -225,7 +225,7 @@ public class SmapUtil {
addSDE();
// write result
- try (FileOutputStream outStream = new
FileOutputStream(outClassFile);) {
+ try (FileOutputStream outStream = new
FileOutputStream(outClassFile)) {
outStream.write(gen, 0, genPos);
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
Tue May 9 12:33:07 2017
@@ -318,7 +318,7 @@ public class PoolableConnectionFactory
throw new SQLException("initializeConnection: connection closed");
}
if(null != sqls) {
- try (Statement stmt = conn.createStatement();) {
+ try (Statement stmt = conn.createStatement()) {
for (final String sql : sqls) {
if (sql == null) {
throw new NullPointerException(
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
Tue May 9 12:33:07 2017
@@ -37,5 +37,5 @@ enum Encryption {
FZA,
RC4,
RC2,
- eNULL;
+ eNULL
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/EncryptionLevel.java
Tue May 9 12:33:07 2017
@@ -24,5 +24,5 @@ enum EncryptionLevel {
LOW,
MEDIUM,
HIGH,
- FIPS;
+ FIPS
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/KeyExchange.java
Tue May 9 12:33:07 2017
@@ -32,5 +32,5 @@ enum KeyExchange {
SRP /* SSL_kSRP - SRP */,
RSAPSK,
ECDHEPSK,
- DHEPSK;
+ DHEPSK
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/MessageDigest.java
Tue May 9 12:33:07 2017
@@ -24,5 +24,5 @@ enum MessageDigest {
GOST89MAC,
SHA256,
SHA384,
- AEAD;
+ AEAD
}
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteOutputStream.java
Tue May 9 12:33:07 2017
@@ -116,7 +116,7 @@ public class TestCoyoteOutputStream exte
int rc = getUrl("http://localhost:"; + getPort() + "/", bc, null, null);
Assert.assertEquals(HttpServletResponse.SC_OK, rc);
File file = new
File("test/org/apache/catalina/connector/test_content.txt");
- try (RandomAccessFile raf = new RandomAccessFile(file, "r");) {
+ try (RandomAccessFile raf = new RandomAccessFile(file, "r")) {
ByteChunk expected = new ByteChunk();
expected.append(raf.getChannel().map(MapMode.READ_ONLY, 0,
file.length()));
Assert.assertTrue(expected.equals(bc));
@@ -284,7 +284,7 @@ public class TestCoyoteOutputStream exte
throws ServletException, IOException {
CoyoteOutputStream os = (CoyoteOutputStream)
resp.getOutputStream();
File file = new
File("test/org/apache/catalina/connector/test_content.txt");
- try (RandomAccessFile raf = new RandomAccessFile(file, "r");) {
+ try (RandomAccessFile raf = new RandomAccessFile(file, "r")) {
os.write(raf.getChannel().map(MapMode.READ_ONLY, 0,
file.length()));
}
}
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Tue May
9 12:33:07 2017
@@ -96,7 +96,7 @@ public class TestSendFile extends Tomcat
public File generateFile(String dir, String suffix, int size) throws
IOException {
String name = "testSendFile-" + System.currentTimeMillis() + suffix +
".txt";
File f = new File(dir, name);
- try (FileWriter fw = new FileWriter(f, false); BufferedWriter w = new
BufferedWriter(fw);) {
+ try (FileWriter fw = new FileWriter(f, false); BufferedWriter w = new
BufferedWriter(fw)) {
int defSize = 8192;
while (size > 0) {
int bytes = Math.min(size, defSize);
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Tue
May 9 12:33:07 2017
@@ -270,7 +270,7 @@ public class TestVirtualContext extends
MyAnnotatedServlet.class.getSimpleName() + ".class");
FileOutputStream annotatedServletClassOutputStream = new
FileOutputStream(new File(
targetPackageForAnnotatedClass,
MyAnnotatedServlet.class.getSimpleName()
- + ".class"));) {
+ + ".class"))) {
IOUtils.copy(annotatedServletClassInputStream,
annotatedServletClassOutputStream);
}
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Tue
May 9 12:33:07 2017
@@ -456,7 +456,7 @@ public class TestDefaultServlet extends
File webxml = new File(appDir, "WEB-INF/web.xml");
try (FileOutputStream fos = new FileOutputStream(webxml);
- Writer w = new OutputStreamWriter(fos, "UTF-8");) {
+ Writer w = new OutputStreamWriter(fos, "UTF-8")) {
w.write("<?xml version='1.0' encoding='UTF-8'?>\n"
+ "<web-app xmlns='http://java.sun.com/xml/ns/j2ee' "
+ " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
@@ -538,7 +538,7 @@ public class TestDefaultServlet extends
File webxml = new File(appDir, "WEB-INF/web.xml");
try (FileOutputStream fos = new FileOutputStream(webxml);
- Writer w = new OutputStreamWriter(fos, "UTF-8");) {
+ Writer w = new OutputStreamWriter(fos, "UTF-8")) {
w.write("<?xml version='1.0' encoding='UTF-8'?>\n"
+ "<web-app xmlns='http://java.sun.com/xml/ns/j2ee' "
+ " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebRuleSet.java
Tue May 9 12:33:07 2017
@@ -139,7 +139,7 @@ public class TestWebRuleSet {
boolean result = true;
- try (InputStream is = new FileInputStream(f);) {
+ try (InputStream is = new FileInputStream(f)) {
d.parse(is);
} catch (Exception e) {
if (expected) {
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1794554&r1=1794553&r2=1794554&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Tue May 9 12:33:07 2017
@@ -76,7 +76,7 @@ public class TestWsServerContainer exten
SimpleClient client = new SimpleClient();
URI uri = new URI("ws://localhost:" + getPort() + "/echoBasic");
- try (Session session = wsContainer.connectToServer(client, uri);) {
+ try (Session session = wsContainer.connectToServer(client, uri)) {
CountDownLatch latch = new CountDownLatch(1);
BasicText handler = new BasicText(latch);
session.addMessageHandler(handler);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
