[tomcat] branch 8.5.x updated: Code clean-up. Add braces for clarity.
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 ded4135 Code clean-up. Add braces for clarity. ded4135 is described below commit ded413563add3046f8d56be5bac8d910d2c1140f Author: Mark Thomas AuthorDate: Tue May 25 09:15:13 2021 +0100 Code clean-up. Add braces for clarity. --- .../apache/catalina/core/ApplicationContext.java | 22 +- .../catalina/core/ApplicationFilterChain.java | 15 +- .../catalina/core/ApplicationFilterConfig.java | 6 +- .../catalina/core/ApplicationFilterFactory.java| 27 ++- .../catalina/core/ApplicationHttpRequest.java | 27 ++- .../catalina/core/ApplicationHttpResponse.java | 54 +++-- .../apache/catalina/core/ApplicationRequest.java | 9 +- .../apache/catalina/core/ApplicationResponse.java | 18 +- .../org/apache/catalina/core/AsyncContextImpl.java | 4 +- java/org/apache/catalina/core/ContainerBase.java | 42 ++-- .../catalina/core/NamingContextListener.java | 28 ++- java/org/apache/catalina/core/StandardContext.java | 245 ++--- java/org/apache/catalina/core/StandardEngine.java | 18 +- java/org/apache/catalina/core/StandardHost.java| 18 +- .../org/apache/catalina/core/StandardPipeline.java | 22 +- java/org/apache/catalina/core/StandardServer.java | 15 +- java/org/apache/catalina/core/StandardService.java | 18 +- .../catalina/core/StandardThreadExecutor.java | 3 +- java/org/apache/catalina/core/StandardWrapper.java | 54 +++-- .../apache/catalina/core/StandardWrapperValve.java | 12 +- .../core/ThreadLocalLeakPreventionListener.java| 4 +- java/org/apache/catalina/ha/ClusterListener.java | 13 +- .../apache/catalina/ha/backend/CollectedInfo.java | 9 +- .../catalina/ha/backend/HeartbeatListener.java | 5 +- .../catalina/ha/backend/MultiCastSender.java | 3 +- java/org/apache/catalina/ha/backend/TcpSender.java | 7 +- .../catalina/ha/context/ReplicatedContext.java | 14 +- .../apache/catalina/ha/deploy/FarmWarDeployer.java | 79 --- .../catalina/ha/deploy/FileMessageFactory.java | 15 +- java/org/apache/catalina/ha/deploy/WarWatcher.java | 18 +- .../apache/catalina/ha/session/BackupManager.java | 15 +- .../catalina/ha/session/ClusterManagerBase.java| 14 +- .../ha/session/ClusterSessionListener.java | 10 +- .../apache/catalina/ha/session/DeltaManager.java | 49 +++-- .../apache/catalina/ha/session/DeltaRequest.java | 44 ++-- .../apache/catalina/ha/session/DeltaSession.java | 45 ++-- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 82 +-- 37 files changed, 736 insertions(+), 347 deletions(-) diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java index 4511e87..91d7ffe 100644 --- a/java/org/apache/catalina/core/ApplicationContext.java +++ b/java/org/apache/catalina/core/ApplicationContext.java @@ -345,14 +345,17 @@ public class ApplicationContext implements ServletContext { @Override public String getMimeType(String file) { -if (file == null) +if (file == null) { return null; +} int period = file.lastIndexOf('.'); -if (period < 0) +if (period < 0) { return null; +} String extension = file.substring(period + 1); -if (extension.length() < 1) +if (extension.length() < 1) { return null; +} return context.findMimeMapping(extension); } @@ -368,13 +371,15 @@ public class ApplicationContext implements ServletContext { public RequestDispatcher getNamedDispatcher(String name) { // Validate the name argument -if (name == null) +if (name == null) { return null; +} // Create and return a corresponding request dispatcher Wrapper wrapper = (Wrapper) context.findChild(name); -if (wrapper == null) +if (wrapper == null) { return null; +} return new ApplicationDispatcher(wrapper, null, null, null, null, null, name); @@ -1148,7 +1153,9 @@ public class ApplicationContext implements ServletContext { match = true; } -if (match) return; +if (match) { +return; +} if (t instanceof ServletContextListener) { throw new IllegalArgumentException(sm.getString( @@ -1377,8 +1384,9 @@ public class ApplicationContext implements ServletContext { */ void setAttributeReadOnly(String name) { -if (attributes.containsKey(name)) +if (attributes.containsKey(name)) { readOnlyAttributes.put(name, name); +} } diff --git
[tomcat] branch 8.5.x updated: Code clean-up. Add braces for clarity.
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 c358936 Code clean-up. Add braces for clarity. c358936 is described below commit c358936e30212e96578b75f5c311f6f6434296b8 Author: Mark Thomas AuthorDate: Mon May 24 17:24:11 2021 +0100 Code clean-up. Add braces for clarity. --- java/javax/servlet/UnavailableException.java | 10 +- java/javax/servlet/jsp/tagext/TagInfo.java | 9 +- .../catalina/ant/jmx/JMXAccessorSetTask.java | 6 +- .../apache/catalina/ant/jmx/JMXAccessorTask.java | 47 --- .../authenticator/NonLoginAuthenticator.java | 3 +- .../catalina/authenticator/SavedRequest.java | 5 +- .../authenticator/SpnegoAuthenticator.java | 40 -- java/org/apache/catalina/connector/Response.java | 5 +- .../catalina/core/ApplicationDispatcher.java | 141 - .../apache/catalina/filters/RemoteCIDRFilter.java | 3 +- 10 files changed, 162 insertions(+), 107 deletions(-) diff --git a/java/javax/servlet/UnavailableException.java b/java/javax/servlet/UnavailableException.java index c03c6d2..afa0399 100644 --- a/java/javax/servlet/UnavailableException.java +++ b/java/javax/servlet/UnavailableException.java @@ -82,10 +82,11 @@ public class UnavailableException extends ServletException { public UnavailableException(int seconds, Servlet servlet, String msg) { super(msg); this.servlet = servlet; -if (seconds <= 0) +if (seconds <= 0) { this.seconds = -1; -else +} else { this.seconds = seconds; +} permanent = false; } @@ -125,10 +126,11 @@ public class UnavailableException extends ServletException { public UnavailableException(String msg, int seconds) { super(msg); -if (seconds <= 0) +if (seconds <= 0) { this.seconds = -1; -else +} else { this.seconds = seconds; +} servlet = null; permanent = false; } diff --git a/java/javax/servlet/jsp/tagext/TagInfo.java b/java/javax/servlet/jsp/tagext/TagInfo.java index 6183cf7..8cadf3d 100644 --- a/java/javax/servlet/jsp/tagext/TagInfo.java +++ b/java/javax/servlet/jsp/tagext/TagInfo.java @@ -97,8 +97,9 @@ public class TagInfo { this.tagVariableInfo = null; this.dynamicAttributes = false; -if (tagExtraInfo != null) +if (tagExtraInfo != null) { tagExtraInfo.setTagInfo(this); +} } /** @@ -151,8 +152,9 @@ public class TagInfo { // Use defaults for unspecified values this.dynamicAttributes = false; -if (tagExtraInfo != null) +if (tagExtraInfo != null) { tagExtraInfo.setTagInfo(this); +} } /** @@ -207,8 +209,9 @@ public class TagInfo { this.tagVariableInfo = tvi; this.dynamicAttributes = dynamicAttributes; -if (tagExtraInfo != null) +if (tagExtraInfo != null) { tagExtraInfo.setTagInfo(this); +} } /** diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index 74f2201..478b01c 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -160,8 +160,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask { String mType = getMBeanAttributeType(jmxServerConnection, name, attribute); realValue = convertStringToType(value, mType); -} else +} else { realValue = value; +} } jmxServerConnection.setAttribute(new ObjectName(name), new Attribute( attribute, realValue)); @@ -187,8 +188,9 @@ public class JMXAccessorSetTask extends JMXAccessorTask { MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname); MBeanAttributeInfo attrs[] = minfo.getAttributes(); for (int i = 0; mattrType == null && i < attrs.length; i++) { -if (attribute.equals(attrs[i].getName())) +if (attribute.equals(attrs[i].getName())) { mattrType = attrs[i].getType(); +} } return mattrType; } diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java index d79e471..3ef604d 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java @@ -358,11 +358,11 @@ public class JMXAccessorTask extends BaseRedirectorHelperTask { String host, String port, String username, String password)
[tomcat] branch 8.5.x updated: Code clean-up: Add braces for clarity
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 010fa29 Code clean-up: Add braces for clarity 010fa29 is described below commit 010fa29d1840d13fd926c5e102ce6742af45d71f Author: Mark Thomas AuthorDate: Mon May 24 11:53:59 2021 +0100 Code clean-up: Add braces for clarity Trivial commit to trigger a CI build to test CI changes --- java/javax/servlet/http/HttpServlet.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/javax/servlet/http/HttpServlet.java b/java/javax/servlet/http/HttpServlet.java index 57617e7..7cc00bc 100644 --- a/java/javax/servlet/http/HttpServlet.java +++ b/java/javax/servlet/http/HttpServlet.java @@ -688,10 +688,12 @@ public abstract class HttpServlet extends GenericServlet { */ private void maybeSetLastModified(HttpServletResponse resp, long lastModified) { -if (resp.containsHeader(HEADER_LASTMOD)) +if (resp.containsHeader(HEADER_LASTMOD)) { return; -if (lastModified >= 0) +} +if (lastModified >= 0) { resp.setDateHeader(HEADER_LASTMOD, lastModified); +} } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Code clean-up: Add braces for clarity
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 d579310 Code clean-up: Add braces for clarity d579310 is described below commit d579310e2d08d957454ffdda5b727a23f70d54bb Author: Mark Thomas AuthorDate: Mon May 24 11:08:15 2021 +0100 Code clean-up: Add braces for clarity Trivial commit to trigger a CI build to test CI changes --- java/javax/el/CompositeELResolver.java | 3 ++- java/javax/el/StandardELContext.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java index f28f528..1fc198a 100644 --- a/java/javax/el/CompositeELResolver.java +++ b/java/javax/el/CompositeELResolver.java @@ -198,8 +198,9 @@ public class CompositeELResolver extends ELResolver { @Override public boolean hasNext() { -if (this.next != null) +if (this.next != null) { return true; +} if (this.itr != null) { while (this.next == null && itr.hasNext()) { this.next = itr.next(); diff --git a/java/javax/el/StandardELContext.java b/java/javax/el/StandardELContext.java index d313483..dff329a 100644 --- a/java/javax/el/StandardELContext.java +++ b/java/javax/el/StandardELContext.java @@ -133,8 +133,9 @@ public class StandardELContext extends ELContext { @Override public ValueExpression setVariable(String variable, ValueExpression expression) { -if (vars == null) +if (vars == null) { vars = new HashMap<>(); +} if (expression == null) { return vars.remove(variable); } else { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org