[tomcat] branch 8.5.x updated: Clean-up. Fix indents.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 0704475  Clean-up. Fix indents.
0704475 is described below

commit 0704475028478757eb31578e2b9fe24dbd0da8da
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 3 16:52:16 2021 +0100

    Clean-up. Fix indents.
---
 java/javax/servlet/http/HttpServlet.java | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/java/javax/servlet/http/HttpServlet.java 
b/java/javax/servlet/http/HttpServlet.java
index 49d77e8..1b252a2 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -87,10 +87,8 @@ public abstract class HttpServlet extends GenericServlet {
     private static final String HEADER_IFMODSINCE = "If-Modified-Since";
     private static final String HEADER_LASTMOD = "Last-Modified";
 
-    private static final String LSTRING_FILE =
-        "javax.servlet.http.LocalStrings";
-    private static final ResourceBundle lStrings =
-        ResourceBundle.getBundle(LSTRING_FILE);
+    private static final String LSTRING_FILE = 
"javax.servlet.http.LocalStrings";
+    private static final ResourceBundle lStrings = 
ResourceBundle.getBundle(LSTRING_FILE);
 
 
     /**
@@ -423,13 +421,9 @@ public abstract class HttpServlet extends GenericServlet {
         Method[] thisMethods = c.getDeclaredMethods();
 
         if ((parentMethods != null) && (parentMethods.length > 0)) {
-            Method[] allMethods =
-                new Method[parentMethods.length + thisMethods.length];
-            System.arraycopy(parentMethods, 0, allMethods, 0,
-                             parentMethods.length);
-            System.arraycopy(thisMethods, 0, allMethods, parentMethods.length,
-                             thisMethods.length);
-
+            Method[] allMethods = new Method[parentMethods.length + 
thisMethods.length];
+            System.arraycopy(parentMethods, 0, allMethods, 0, 
parentMethods.length);
+            System.arraycopy(thisMethods, 0, allMethods, parentMethods.length, 
thisMethods.length);
             thisMethods = allMethods;
         }
 
@@ -593,8 +587,8 @@ public abstract class HttpServlet extends GenericServlet {
         int responseLength;
 
         String CRLF = "\r\n";
-        StringBuilder buffer = new StringBuilder("TRACE 
").append(req.getRequestURI())
-            .append(" ").append(req.getProtocol());
+        StringBuilder buffer =
+                new StringBuilder("TRACE 
").append(req.getRequestURI()).append(" ").append(req.getProtocol());
 
         Enumeration<String> reqHeaderEnum = req.getHeaderNames();
 
@@ -864,10 +858,8 @@ class NoBodyResponse extends HttpServletResponseWrapper {
 // file private
 class NoBodyOutputStream extends ServletOutputStream {
 
-    private static final String LSTRING_FILE =
-        "javax.servlet.http.LocalStrings";
-    private static final ResourceBundle lStrings =
-        ResourceBundle.getBundle(LSTRING_FILE);
+    private static final String LSTRING_FILE = 
"javax.servlet.http.LocalStrings";
+    private static final ResourceBundle lStrings = 
ResourceBundle.getBundle(LSTRING_FILE);
 
     private final HttpServletResponse response;
     private boolean flushed = false;

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org