This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push: new fff2cc3 Code clean-up: Add braces for clarity fff2cc3 is described below commit fff2cc3661a4729f19b9a184f2b1bbbe445e8667 Author: Mark Thomas <ma...@apache.org> 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/jakarta/el/CompositeELResolver.java | 3 ++- java/jakarta/el/StandardELContext.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/jakarta/el/CompositeELResolver.java b/java/jakarta/el/CompositeELResolver.java index e0123f3..d144f2c 100644 --- a/java/jakarta/el/CompositeELResolver.java +++ b/java/jakarta/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/jakarta/el/StandardELContext.java b/java/jakarta/el/StandardELContext.java index 59bffbf..669a072 100644 --- a/java/jakarta/el/StandardELContext.java +++ b/java/jakarta/el/StandardELContext.java @@ -131,8 +131,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