[tomcat] branch 8.5.x updated: Upgrade Readability by removing brackets (#652)

[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 6cd7182de4 Upgrade Readability by removing brackets (#652)
6cd7182de4 is described below

commit 6cd7182de4b93d95d8f5b2581b963aed6f60646f
Author: iamjooon2 <iamjoo...@gmail.com>
AuthorDate: Thu Sep 7 05:18:22 2023 +0900

    Upgrade Readability by removing brackets (#652)
    
    Remove needless brackets
---
 java/org/apache/coyote/Request.java                                   | 2 +-
 java/org/apache/coyote/ajp/Constants.java                             | 3 +--
 java/org/apache/coyote/http11/Http11InputBuffer.java                  | 4 ++--
 java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/Request.java 
b/java/org/apache/coyote/Request.java
index 354c4ac289..ecfdf1abb6 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -824,7 +824,7 @@ public final class Request {
             encoding = encoding.substring(0, end);
         }
         encoding = encoding.trim();
-        if ((encoding.length() > 2) && (encoding.startsWith("\"")) && 
(encoding.endsWith("\""))) {
+        if (encoding.length() > 2 && encoding.startsWith("\"") && 
encoding.endsWith("\"")) {
             encoding = encoding.substring(1, encoding.length() - 1);
         }
 
diff --git a/java/org/apache/coyote/ajp/Constants.java 
b/java/org/apache/coyote/ajp/Constants.java
index bdda943754..f124d8ebcb 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -173,8 +173,7 @@ public final class Constants {
 
     static {
         try {
-            int i;
-            for (i = 0; i < SC_RESP_AJP13_MAX; i++) {
+            for (int i = 0; i < SC_RESP_AJP13_MAX; i++) {
                 responseTransMap.put(getResponseHeaderForCode(i), 
Integer.valueOf(0xA001 + i));
             }
         } catch (Exception e) {
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java 
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index 002b304ccf..da3e456d2f 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -574,7 +574,7 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
                 }
             }
 
-            if ((end - parsingRequestLineStart) > 0) {
+            if (end - parsingRequestLineStart > 0) {
                 request.protocol().setBytes(byteBuffer.array(), 
parsingRequestLineStart, end - parsingRequestLineStart);
                 parsingRequestLinePhase = 7;
             }
@@ -906,7 +906,7 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
             }
 
             // chr is next byte of header name. Convert to lowercase.
-            if ((chr >= Constants.A) && (chr <= Constants.Z)) {
+            if (chr >= Constants.A && chr <= Constants.Z) {
                 byteBuffer.put(pos, (byte) (chr - Constants.LC_OFFSET));
             }
         }
diff --git 
a/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java 
b/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
index 36ee4796df..e857517e2b 100644
--- a/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
+++ b/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
@@ -189,7 +189,7 @@ public class UpgradeServletOutputStream extends 
ServletOutputStream {
             return;
         }
         closed = true;
-        flushInternal((listener == null), false);
+        flushInternal(listener == null, false);
     }
 
 


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