[tomcat] branch 8.5.x updated: Revert

[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 2808a97  Revert
2808a97 is described below

commit 2808a97cd1c524fa8e187b4bf4bbd189c80a5085
Author: remm <r...@apache.org>
AuthorDate: Wed May 13 15:48:12 2020 +0200

    Revert
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index a559124..0f11f3d 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -72,8 +72,6 @@ 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);
 
@@ -616,7 +614,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");
             }
         }
 
@@ -634,7 +632,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())) {
@@ -645,7 +643,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