You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/09/17 19:37:10 UTC

[tomcat] branch 8.5.x updated (7d497f6 -> 5708423)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 7d497f6  Update changelog
     new 0de987e  space police
     new 5708423  Refactor for Java 7

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/javax/el/ELContext.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


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


[tomcat] 01/02: space police

Posted by ma...@apache.org.
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

commit 0de987ea2eafd075aaf150c4a47a670ad1ee25be
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 17 20:28:44 2020 +0100

    space police
---
 java/javax/el/ELContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index ca184ca..58c5db5 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -194,7 +194,7 @@ public abstract class ELContext {
         if (listeners == null) {
             return;
         }
-        
+
         for (EvaluationListener listener : listeners) {
             try {
                 listener.afterEvaluation(this, expression);


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


[tomcat] 02/02: Refactor for Java 7

Posted by ma...@apache.org.
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

commit 570842358a1832f02039bbd361b12a0615f31cb5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 17 20:36:56 2020 +0100

    Refactor for Java 7
---
 java/javax/el/ELContext.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index 58c5db5..d33d8b3 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -158,7 +158,11 @@ public abstract class ELContext {
      * @since EL 3.0
      */
     public List<EvaluationListener> getEvaluationListeners() {
-        return listeners == null ? Collections.emptyList() : listeners;
+        if (listeners == null) {
+            return Collections.emptyList();
+        } else {
+            return listeners;
+        }
     }
 
     /**


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