[tomcat] branch 8.5.x updated: Add a constant for invalid URI

[remm]

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

remm 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 e9fcc05  Add a constant for invalid URI
e9fcc05 is described below

commit e9fcc05ed6aa9222c30fc694c0ff2f517ea1ed65
Author: remm <r...@apache.org>
AuthorDate: Wed May 13 09:45:03 2020 +0200

    Add a constant for invalid URI
    
    Add a space to it to make the code look cleaner.
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 0f11f3d..a559124 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -72,6 +72,8 @@ public class CoyoteAdapter implements Adapter {
             System.getProperty("java.vm.vendor") + "/" +
             System.getProperty("java.runtime.version") + ")";
 
+    private static final String INVALID_URI = "Invalid URI ";
+
     private static final EnumSet<SessionTrackingMode> SSL_ONLY =
         EnumSet.of(SessionTrackingMode.SSL);
 
@@ -614,7 +616,7 @@ public class CoyoteAdapter implements Adapter {
                 connector.getService().getContainer().logAccess(request, 
response, 0, true);
                 return false;
             } else {
-                response.sendError(400, "Invalid URI");
+                response.sendError(400, INVALID_URI);
             }
         }
 
@@ -632,7 +634,7 @@ public class CoyoteAdapter implements Adapter {
             try {
                 req.getURLDecoder().convert(decodedURI.getByteChunk(), 
connector.getEncodedSolidusHandlingInternal());
             } catch (IOException ioe) {
-                response.sendError(400, "Invalid URI: " + ioe.getMessage());
+                response.sendError(400, INVALID_URI + ioe.getMessage());
             }
             // Normalization
             if (normalize(req.decodedURI())) {
@@ -643,7 +645,7 @@ public class CoyoteAdapter implements Adapter {
                     response.sendError(400, "Invalid URI");
                 }
             } else {
-                response.sendError(400, "Invalid URI");
+                response.sendError(400, INVALID_URI);
             }
         } else {
             /* The URI is chars or String, and has been sent using an in-memory


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