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 f6ada28 Code clean-up: Add braces for clarity
f6ada28 is described below
commit f6ada28ec4ea9394c53a484c378fc34608502a38
Author: Mark Thomas <[email protected]>
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: [email protected]
For additional commands, e-mail: [email protected]
