[tomcat] branch 8.5.x updated: Polish. Align with 9.0.x.

[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 66286b4  Polish. Align with 9.0.x.
66286b4 is described below

commit 66286b4fbe47847f998cb080929da63f6799f58a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Sep 7 23:04:00 2019 +0100

    Polish. Align with 9.0.x.
---
 java/org/apache/catalina/filters/AddDefaultCharsetFilter.java | 2 +-
 java/org/apache/catalina/manager/host/HostManagerServlet.java | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
index 29bcb68..b146764 100644
--- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
+++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
@@ -109,7 +109,7 @@ public class AddDefaultCharsetFilter extends FilterBase {
         public void setContentType(String ct) {
 
             if (ct != null && ct.startsWith("text/")) {
-                if (ct.indexOf("charset=") < 0) {
+                if (!ct.contains("charset=")) {
                     super.setContentType(ct + ";charset=" + encoding);
                 } else {
                     super.setContentType(ct);
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java 
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index 729717f..f88b931 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -584,9 +584,7 @@ public class HostManagerServlet
                     "hostManagerServlet.startFailed", name));
             writer.println(smClient.getString(
                     "hostManagerServlet.exception", e.toString()));
-            return;
         }
-
     }
 
 
@@ -646,9 +644,7 @@ public class HostManagerServlet
                     name));
             writer.println(smClient.getString("hostManagerServlet.exception",
                     e.toString()));
-            return;
         }
-
     }
 
 


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