[commons-jexl] branch master updated: JEXL: getting ready for RC2 ;

[henrib]

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

henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e91dc63 JEXL: getting ready for RC2 ;
4e91dc63 is described below

commit 4e91dc63dba73204c8a69295e1ab402c1ab7d3e4
Author: henrib <hen...@apache.org>
AuthorDate: Fri Mar 17 18:46:48 2023 +0100

    JEXL: getting ready for RC2 ;
---
 .../internal/introspection/PermissionsParser.java  | 29 ++++++++++++----------
 .../jexl3/parser/ASTIdentifierAccessJxlt.java      |  4 ---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/jexl3/internal/introspection/PermissionsParser.java
 
b/src/main/java/org/apache/commons/jexl3/internal/introspection/PermissionsParser.java
index d5084c9d..38c657c1 100644
--- 
a/src/main/java/org/apache/commons/jexl3/internal/introspection/PermissionsParser.java
+++ 
b/src/main/java/org/apache/commons/jexl3/internal/introspection/PermissionsParser.java
@@ -65,7 +65,7 @@ public class PermissionsParser {
     /**
      * Clears this parser internals.
      */
-    public void clear() {
+    private void clear() {
         src = null; size = 0; packages = null; wildcards = null;
     }
 
@@ -86,19 +86,22 @@ public class PermissionsParser {
      * @return the permissions map
      */
     synchronized Permissions parse(Set<String> wildcards, Map<String, 
Permissions.NoJexlPackage> packages, final String... srcs) {
-        if (srcs == null || srcs.length == 0) {
-            return Permissions.UNRESTRICTED;
-        }
-        this.packages = packages;
-        this.wildcards = wildcards;
-        for(final String src : srcs) {
-            this.src = src;
-            this.size = src.length();
-            readPackages();
+        try {
+            if (srcs == null || srcs.length == 0) {
+                return Permissions.UNRESTRICTED;
+            }
+            this.packages = packages;
+            this.wildcards = wildcards;
+            for (final String src : srcs) {
+                this.src = src;
+                this.size = src.length();
+                readPackages();
+            }
+            final Permissions permissions = new Permissions(wildcards, 
packages);
+            return permissions;
+        } finally {
+            clear();
         }
-        final Permissions permissions = new Permissions(wildcards, packages);
-        clear();
-        return permissions;
     }
 
     /**
diff --git 
a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java 
b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java
index 240bb475..73af1772 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/ASTIdentifierAccessJxlt.java
@@ -23,10 +23,6 @@ import org.apache.commons.jexl3.JxltEngine;
  * x.`expr`.
  */
 public class ASTIdentifierAccessJxlt extends ASTIdentifierAccess {
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
     protected JxltEngine.Expression jxltExpr;
 
     ASTIdentifierAccessJxlt(final int id) {