This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 33d28e9 Trivial commit to trigger CI
33d28e9 is described below
commit 33d28e9ff0dd9ae6d9fa09486d0df00dabd7e2b8
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 4 16:37:51 2019 +0100
Trivial commit to trigger CI
Cosmetic / trivial changes to reduce 8.5.x / 7.0.x diff
---
java/javax/servlet/http/HttpServlet.java | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/java/javax/servlet/http/HttpServlet.java
b/java/javax/servlet/http/HttpServlet.java
index 0fd2751..8478e4c 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -70,8 +70,6 @@ import javax.servlet.ServletResponse;
* <a
href="http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html";>
* Java Tutorial on Multithreaded Programming</a> for more
* information on handling multiple threads in a Java program.
- *
- * @author Various
*/
public abstract class HttpServlet extends GenericServlet {
@@ -90,7 +88,7 @@ public abstract class HttpServlet extends GenericServlet {
private static final String LSTRING_FILE =
"javax.servlet.http.LocalStrings";
- private static ResourceBundle lStrings =
+ private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
@@ -582,7 +580,6 @@ public abstract class HttpServlet extends GenericServlet {
ServletOutputStream out = resp.getOutputStream();
out.print(buffer.toString());
out.close();
- return;
}
@@ -741,9 +738,9 @@ public abstract class HttpServlet extends GenericServlet {
*/
// file private
class NoBodyResponse extends HttpServletResponseWrapper {
- private NoBodyOutputStream noBody;
- private PrintWriter writer;
- private boolean didSetContentLength;
+ private final NoBodyOutputStream noBody;
+ private PrintWriter writer;
+ private boolean didSetContentLength;
// file private
NoBodyResponse(HttpServletResponse r) {
@@ -828,10 +825,10 @@ class NoBodyOutputStream extends ServletOutputStream {
private static final String LSTRING_FILE =
"javax.servlet.http.LocalStrings";
- private static ResourceBundle lStrings =
+ private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
- private int contentLength = 0;
+ private int contentLength = 0;
// file private
NoBodyOutputStream() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
