[tomcat] branch 8.5.x updated: Trivial clean-up to trigger CI build

[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 680cbf1  Trivial clean-up to trigger CI build
680cbf1 is described below

commit 680cbf12dea1e42fbe10b7cedf1ab07a00f2c314
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 2 21:33:54 2020 +0000

    Trivial clean-up to trigger CI build
---
 .../org/apache/catalina/filters/AddDefaultCharsetFilter.java | 12 ++++++------
 java/org/apache/catalina/ha/backend/MultiCastSender.java     |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java 
b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
index b146764..98adb4f 100644
--- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
+++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
@@ -106,17 +106,17 @@ public class AddDefaultCharsetFilter extends FilterBase {
         }
 
         @Override
-        public void setContentType(String ct) {
+        public void setContentType(String contentType) {
 
-            if (ct != null && ct.startsWith("text/")) {
-                if (!ct.contains("charset=")) {
-                    super.setContentType(ct + ";charset=" + encoding);
+            if (contentType != null && contentType.startsWith("text/")) {
+                if (!contentType.contains("charset=")) {
+                    super.setContentType(contentType + ";charset=" + encoding);
                 } else {
-                    super.setContentType(ct);
+                    super.setContentType(contentType);
                     encoding = getCharacterEncoding();
                 }
             } else {
-                super.setContentType(ct);
+                super.setContentType(contentType);
             }
 
         }
diff --git a/java/org/apache/catalina/ha/backend/MultiCastSender.java 
b/java/org/apache/catalina/ha/backend/MultiCastSender.java
index 60feacf..b955eee 100644
--- a/java/org/apache/catalina/ha/backend/MultiCastSender.java
+++ b/java/org/apache/catalina/ha/backend/MultiCastSender.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.ha.backend;
 
 import java.net.DatagramPacket;


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