JEXL: getting ready for RC2 ;
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 d5084c9..38c657c 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 @@
/**
* Clears this parser internals.
*/
- public void clear() {
+ private void clear() {
src = null; size = 0; packages = null; wildcards = null;
}
@@ -86,19 +86,22 @@
* @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;
+ 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();
}
- 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);
- 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 240bb47..73af177 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 @@
* x.`expr`.
*/
public class ASTIdentifierAccessJxlt extends ASTIdentifierAccess {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
protected JxltEngine.Expression jxltExpr;
ASTIdentifierAccessJxlt(final int id) {
