This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new d411a77 SpotBugs - simplify logic d411a77 is described below commit d411a773a239c8a2042fb37e66fb1fdd7637d858 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Oct 16 09:47:53 2020 +0100 SpotBugs - simplify logic --- java/org/apache/catalina/valves/HealthCheckValve.java | 2 +- java/org/apache/tomcat/util/digester/SetPropertiesRule.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/valves/HealthCheckValve.java b/java/org/apache/catalina/valves/HealthCheckValve.java index 91b33e9..2a61cf2 100644 --- a/java/org/apache/catalina/valves/HealthCheckValve.java +++ b/java/org/apache/catalina/valves/HealthCheckValve.java @@ -96,7 +96,7 @@ public class HealthCheckValve extends ValveBase { context ? request.getRequestPathMB() : request.getDecodedRequestURIMB(); if (urlMB.equals(path)) { response.setContentType("application/json"); - if (!checkContainersAvailable || (checkContainersAvailable && isAvailable(getContainer()))) { + if (!checkContainersAvailable || isAvailable(getContainer())) { response.getOutputStream().print(UP); } else { response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE); diff --git a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java index 4779891..cec8263 100644 --- a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java +++ b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java @@ -95,8 +95,7 @@ public class SetPropertiesRule extends Rule { "} Setting property '" + name + "' to '" + value + "'"); } - if (!digester.isFakeAttribute(top, name) - && (excludes == null || (excludes != null && !excludes.containsKey(name)))) { + if (!digester.isFakeAttribute(top, name) && (excludes == null || !excludes.containsKey(name))) { StringBuilder actualMethod = null; if (code != null) { actualMethod = new StringBuilder(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org