(tomcat) 02/04: Clean-up prior to fixing BZ 68119

[markt]

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

commit fe9287e3dd54325fb5c04125b6f76425ecabb232
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Nov 27 13:43:00 2023 +0000

    Clean-up prior to fixing BZ 68119
---
 java/javax/el/CompositeELResolver.java | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/java/javax/el/CompositeELResolver.java 
b/java/javax/el/CompositeELResolver.java
index bed5375929..dade342c72 100644
--- a/java/javax/el/CompositeELResolver.java
+++ b/java/javax/el/CompositeELResolver.java
@@ -34,32 +34,32 @@ public class CompositeELResolver extends ELResolver {
         SCOPED_ATTRIBUTE_EL_RESOLVER = clazz;
     }
 
-    private int size;
+    private int resolversSize;
 
     private ELResolver[] resolvers;
 
     public CompositeELResolver() {
-        this.size = 0;
-        this.resolvers = new ELResolver[8];
+        resolversSize = 0;
+        resolvers = new ELResolver[8];
     }
 
     public void add(ELResolver elResolver) {
         Objects.requireNonNull(elResolver);
 
-        if (this.size >= this.resolvers.length) {
-            ELResolver[] nr = new ELResolver[this.size * 2];
-            System.arraycopy(this.resolvers, 0, nr, 0, this.size);
-            this.resolvers = nr;
+        if (resolversSize >= resolvers.length) {
+            ELResolver[] nr = new ELResolver[resolversSize * 2];
+            System.arraycopy(resolvers, 0, nr, 0, resolversSize);
+            resolvers = nr;
         }
-        this.resolvers[this.size++] = elResolver;
+        resolvers[resolversSize++] = elResolver;
     }
 
     @Override
     public Object getValue(ELContext context, Object base, Object property) {
         context.setPropertyResolved(false);
-        int sz = this.size;
+        int sz = resolversSize;
         for (int i = 0; i < sz; i++) {
-            Object result = this.resolvers[i].getValue(context, base, 
property);
+            Object result = resolvers[i].getValue(context, base, property);
             if (context.isPropertyResolved()) {
                 return result;
             }
@@ -70,7 +70,7 @@ public class CompositeELResolver extends ELResolver {
     @Override
     public Object invoke(ELContext context, Object base, Object method, 
Class<?>[] paramTypes, Object[] params) {
         context.setPropertyResolved(false);
-        int sz = this.size;
+        int sz = this.resolversSize;
         for (int i = 0; i < sz; i++) {
             Object obj = this.resolvers[i].invoke(context, base, method, 
paramTypes, params);
             if (context.isPropertyResolved()) {
@@ -83,7 +83,7 @@ public class CompositeELResolver extends ELResolver {
     @Override
     public Class<?> getType(ELContext context, Object base, Object property) {
         context.setPropertyResolved(false);
-        int sz = this.size;
+        int sz = this.resolversSize;
         for (int i = 0; i < sz; i++) {
             Class<?> type = this.resolvers[i].getType(context, base, property);
             if (context.isPropertyResolved()) {
@@ -106,7 +106,7 @@ public class CompositeELResolver extends ELResolver {
     @Override
     public void setValue(ELContext context, Object base, Object property, 
Object value) {
         context.setPropertyResolved(false);
-        int sz = this.size;
+        int sz = this.resolversSize;
         for (int i = 0; i < sz; i++) {
             this.resolvers[i].setValue(context, base, property, value);
             if (context.isPropertyResolved()) {
@@ -118,7 +118,7 @@ public class CompositeELResolver extends ELResolver {
     @Override
     public boolean isReadOnly(ELContext context, Object base, Object property) 
{
         context.setPropertyResolved(false);
-        int sz = this.size;
+        int sz = this.resolversSize;
         for (int i = 0; i < sz; i++) {
             boolean readOnly = this.resolvers[i].isReadOnly(context, base, 
property);
             if (context.isPropertyResolved()) {
@@ -130,13 +130,13 @@ public class CompositeELResolver extends ELResolver {
 
     @Override
     public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext 
context, Object base) {
-        return new FeatureIterator(context, base, this.resolvers, this.size);
+        return new FeatureIterator(context, base, this.resolvers, 
this.resolversSize);
     }
 
     @Override
     public Class<?> getCommonPropertyType(ELContext context, Object base) {
         Class<?> commonType = null;
-        int sz = this.size;
+        int sz = this.resolversSize;
         for (int i = 0; i < sz; i++) {
             Class<?> type = this.resolvers[i].getCommonPropertyType(context, 
base);
             if (type != null && (commonType == null || 
commonType.isAssignableFrom(type))) {
@@ -149,7 +149,7 @@ public class CompositeELResolver extends ELResolver {
     @Override
     public Object convertToType(ELContext context, Object obj, Class<?> type) {
         context.setPropertyResolved(false);
-        int sz = this.size;
+        int sz = this.resolversSize;
         for (int i = 0; i < sz; i++) {
             Object result = this.resolvers[i].convertToType(context, obj, 
type);
             if (context.isPropertyResolved()) {


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