[tomcat] branch 10.0.x updated: Fix trailing space

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 57f6b7e  Fix trailing space
57f6b7e is described below

commit 57f6b7ee66d3e1ea745db3bcf3f6a7c1f475fbe0
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:10:55 2021 +0100

Fix trailing space
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index af58da3..9c88fc6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,7 +144,7 @@
 so that it returns the expected value rather than failing when the
 method expression is defined with the parameter values in the 
expression
 rather than the types being passed explicitly to
-ExpressionFactory.createMethodExpression(). (markt) 
+ExpressionFactory.createMethodExpression(). (markt)
   
 
   

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

[tomcat] branch 8.5.x updated: Fix trailing space

2021-09-17 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 83ebc60  Fix trailing space
83ebc60 is described below

commit 83ebc604fb2e94461e2c2c597545c59cb1705cbc
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:10:55 2021 +0100

Fix trailing space
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1bd7248..2b005ad 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,7 +126,7 @@
 so that it returns the expected value rather than failing when the
 method expression is defined with the parameter values in the 
expression
 rather than the types being passed explicitly to
-ExpressionFactory.createMethodExpression(). (markt) 
+ExpressionFactory.createMethodExpression(). (markt)
   
 
   

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

[tomcat] branch 9.0.x updated: Fix trailing space

2021-09-17 Thread 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 1cce34a  Fix trailing space
1cce34a is described below

commit 1cce34a3035d01134db61265956537d508cb9647
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:10:55 2021 +0100

Fix trailing space
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 13465ac..aab6f1f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,7 +144,7 @@
 so that it returns the expected value rather than failing when the
 method expression is defined with the parameter values in the 
expression
 rather than the types being passed explicitly to
-ExpressionFactory.createMethodExpression(). (markt) 
+ExpressionFactory.createMethodExpression(). (markt)
   
 
   

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

[tomcat] branch main updated: Fix trailing space

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 17141fc  Fix trailing space
17141fc is described below

commit 17141fc586510b631102afe498d9dd1e9ceac4db
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:10:55 2021 +0100

Fix trailing space
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ec17488..28b4486 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -165,7 +165,7 @@
 so that it returns the expected value rather than failing when the
 method expression is defined with the parameter values in the 
expression
 rather than the types being passed explicitly to
-ExpressionFactory.createMethodExpression(). (markt) 
+ExpressionFactory.createMethodExpression(). (markt)
   
 
   

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

[tomcat] branch 8.5.x updated: Fix copy/paste error

2021-09-17 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 04e5c05  Fix copy/paste error
04e5c05 is described below

commit 04e5c054e3de762780faa735ed703b0bf90cc870
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:09:16 2021 +0100

Fix copy/paste error
---
 java/org/apache/el/parser/AstValue.java  | 12 +---
 test/org/apache/el/TestMethodExpressionImpl.java | 13 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 4db4a50..dec6259 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -214,13 +214,11 @@ public final class AstValue extends SimpleNode {
 Target t = getTarget(ctx);
 Class[] types = null;
 if (isParametersProvided()) {
-if (isParametersProvided()) {
-Object[] values = ((AstMethodParameters) this.jjtGetChild(
-this.jjtGetNumChildren() - 1)).getParameters(ctx);
-types = getTypesFromValues(values);
-} else {
-types = paramTypes;
-}
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
 }
 Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
 return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index 2c863e3..6b6812d 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -927,4 +927,17 @@ public class TestMethodExpressionImpl {
 Assert.assertEquals(1, mi.getParamTypes().length);
 Assert.assertEquals(String.class, mi.getParamTypes()[0]);
 }
+
+
+@Test
+public void testGetMethodInfo02() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName}", null, new Class[] { String.class } );
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }

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

[tomcat] branch 9.0.x updated: Fix copy/paste error

2021-09-17 Thread 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 1d9230e  Fix copy/paste error
1d9230e is described below

commit 1d9230e3cd1f8342a54bb6b8304a1e8792b29a33
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:09:16 2021 +0100

Fix copy/paste error
---
 java/org/apache/el/parser/AstValue.java  | 12 +---
 test/org/apache/el/TestMethodExpressionImpl.java | 13 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 4db4a50..dec6259 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -214,13 +214,11 @@ public final class AstValue extends SimpleNode {
 Target t = getTarget(ctx);
 Class[] types = null;
 if (isParametersProvided()) {
-if (isParametersProvided()) {
-Object[] values = ((AstMethodParameters) this.jjtGetChild(
-this.jjtGetNumChildren() - 1)).getParameters(ctx);
-types = getTypesFromValues(values);
-} else {
-types = paramTypes;
-}
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
 }
 Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
 return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index c2811bf..97aceaf 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -775,4 +775,17 @@ public class TestMethodExpressionImpl {
 Assert.assertEquals(1, mi.getParamTypes().length);
 Assert.assertEquals(String.class, mi.getParamTypes()[0]);
 }
+
+
+@Test
+public void testGetMethodInfo02() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName}", null, new Class[] { String.class } );
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }

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

[tomcat] branch 10.0.x updated: Fix copy/paste error

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 4b378e4  Fix copy/paste error
4b378e4 is described below

commit 4b378e4765391465319c3ae945ac3a3fd623ee64
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:09:16 2021 +0100

Fix copy/paste error
---
 java/org/apache/el/parser/AstValue.java  | 12 +---
 test/org/apache/el/TestMethodExpressionImpl.java | 13 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 53ce2d6..df45810 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -214,13 +214,11 @@ public final class AstValue extends SimpleNode {
 Target t = getTarget(ctx);
 Class[] types = null;
 if (isParametersProvided()) {
-if (isParametersProvided()) {
-Object[] values = ((AstMethodParameters) this.jjtGetChild(
-this.jjtGetNumChildren() - 1)).getParameters(ctx);
-types = getTypesFromValues(values);
-} else {
-types = paramTypes;
-}
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
 }
 Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
 return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index 2178ce7..b878f5b 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -775,4 +775,17 @@ public class TestMethodExpressionImpl {
 Assert.assertEquals(1, mi.getParamTypes().length);
 Assert.assertEquals(String.class, mi.getParamTypes()[0]);
 }
+
+
+@Test
+public void testGetMethodInfo02() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName}", null, new Class[] { String.class } );
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }

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

[tomcat] branch main updated: Fix copy/paste error

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 4777f30  Fix copy/paste error
4777f30 is described below

commit 4777f307dee44385a88bc1fe06c7a2e9a5baa11b
Author: Mark Thomas 
AuthorDate: Fri Sep 17 22:09:16 2021 +0100

Fix copy/paste error
---
 java/org/apache/el/parser/AstValue.java  | 12 +---
 test/org/apache/el/TestMethodExpressionImpl.java | 13 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 5a07ef4..06a952e 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -215,13 +215,11 @@ public final class AstValue extends SimpleNode {
 Target t = getTarget(ctx);
 Class[] types = null;
 if (isParametersProvided()) {
-if (isParametersProvided()) {
-Object[] values = ((AstMethodParameters) this.jjtGetChild(
-this.jjtGetNumChildren() - 1)).getParameters(ctx);
-types = getTypesFromValues(values);
-} else {
-types = paramTypes;
-}
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
 }
 Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
 return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index 53816ba..2ad619e 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -775,4 +775,17 @@ public class TestMethodExpressionImpl {
 Assert.assertEquals(1, mi.getParamTypes().length);
 Assert.assertEquals(String.class, mi.getParamTypes()[0]);
 }
+
+
+@Test
+public void testGetMethodInfo02() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName}", null, new Class[] { String.class } );
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }

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

Re: [tomcat] branch main updated: Fix BZ 65563. Correct parsing of Content-Range headers

2021-09-17 Thread Mark Thomas 

On 17/09/2021 11:55, Rainer Jung wrote:

Am 09.09.2021 um 09:36 schrieb ma...@apache.org:

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 86bbbc6..aa4aac8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
    issues do not "pop up" wrt. others).
  -->
  
+  
+    
+  
+    65563: Correct parsing of HTTP 
Content-Rnage


Small typo s/Rnage/Range/
Applies to all active branches.


Thanks.

Fixed.

Mark

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

[tomcat] branch 9.0.x updated: Fix typo

2021-09-17 Thread 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new abbe9f0  Fix typo
abbe9f0 is described below

commit abbe9f07c386b173099c05a28c554f832a72aef5
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:39:40 2021 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b13acc0..13465ac 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,7 +116,7 @@
   
 
   
-65563: Correct parsing of HTTP Content-Rnage
+65563: Correct parsing of HTTP Content-Range
 headers. Tomcat was incorrectly requiring an = character
 after bytes. Fix based on pull request 449 by
 Thierry Guérin. (markt)

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

[tomcat] branch 10.0.x updated: Fix typo

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 935feda  Fix typo
935feda is described below

commit 935fedae9a52accbd8895f4b8b12678b5365440d
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:39:40 2021 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b6c4cec..af58da3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,7 +116,7 @@
   
 
   
-65563: Correct parsing of HTTP Content-Rnage
+65563: Correct parsing of HTTP Content-Range
 headers. Tomcat was incorrectly requiring an = character
 after bytes. Fix based on pull request 449 by
 Thierry Guérin. (markt)

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

[tomcat] branch main updated: Fix typo

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 84f42dc  Fix typo
84f42dc is described below

commit 84f42dce3df07e4640051b1430fca239ff5c45cf
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:39:40 2021 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ebc8001..ec17488 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,7 +116,7 @@
   
 
   
-65563: Correct parsing of HTTP Content-Rnage
+65563: Correct parsing of HTTP Content-Range
 headers. Tomcat was incorrectly requiring an = character
 after bytes. Fix based on pull request 449 by
 Thierry Guérin. (markt)

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

Re: [tomcat] branch main updated: Fix MethodExpression.getMethodInfo() when parameters are provided

2021-09-17 Thread Mark Thomas 

On 17/09/2021 21:33, ma...@apache.org wrote:

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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
  new 93dd0c2  Fix MethodExpression.getMethodInfo() when parameters are 
provided
93dd0c2 is described below

commit 93dd0c2e2a15b9e5d37a92b4d435c4f53de3c00d
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:32:38 2021 +0100

 Fix MethodExpression.getMethodInfo() when parameters are provided


Just for background information, I found this while adding some 
additional tests to the EL TCK for 5.0 to provide some coverage for the 
changes between 4.0 and 5.0.


Mark

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

[tomcat] branch 8.5.x updated: Fix MethodExpression.getMethodInfo() when parameters are provided

2021-09-17 Thread markt 
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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new dfe6cb0  Fix MethodExpression.getMethodInfo() when parameters are 
provided
dfe6cb0 is described below

commit dfe6cb037fb6b50dc2f2cb5fe79fe2f0e16befad
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:32:38 2021 +0100

Fix MethodExpression.getMethodInfo() when parameters are provided
---
 java/org/apache/el/parser/AstValue.java  | 16 
 test/org/apache/el/TestMethodExpressionImpl.java | 14 ++
 webapps/docs/changelog.xml   | 11 +++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index db67312..4db4a50 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -212,10 +212,18 @@ public final class AstValue extends SimpleNode {
 @SuppressWarnings("rawtypes") Class[] paramTypes)
 throws ELException {
 Target t = getTarget(ctx);
-Method m = ReflectionUtil.getMethod(
-ctx, t.base, t.property, paramTypes, null);
-return new MethodInfo(m.getName(), m.getReturnType(), m
-.getParameterTypes());
+Class[] types = null;
+if (isParametersProvided()) {
+if (isParametersProvided()) {
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
+}
+}
+Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
+return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
 }
 
 @Override
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index 3d55a25..2c863e3 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -20,6 +20,7 @@ import javax.el.ELContext;
 import javax.el.ELProcessor;
 import javax.el.ExpressionFactory;
 import javax.el.MethodExpression;
+import javax.el.MethodInfo;
 import javax.el.MethodNotFoundException;
 import javax.el.ValueExpression;
 
@@ -913,4 +914,17 @@ public class TestMethodExpressionImpl {
 String elResult = (String) elp.eval("bean1.echo(bean2)");
 Assert.assertEquals("No varargs: xyz", elResult);
 }
+
+
+@Test
+public void testGetMethodInfo01() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName('New value')}", null, null);
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5a1cd81..1bd7248 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,17 @@
   
 
   
+  
+
+  
+Fix the implementation of MethodExpression.getMethodInfo()
+so that it returns the expected value rather than failing when the
+method expression is defined with the parameter values in the 
expression
+rather than the types being passed explicitly to
+ExpressionFactory.createMethodExpression(). (markt) 
+  
+
+  
 
 
   

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

[tomcat] branch 9.0.x updated: Fix MethodExpression.getMethodInfo() when parameters are provided

2021-09-17 Thread 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 2d05397  Fix MethodExpression.getMethodInfo() when parameters are 
provided
2d05397 is described below

commit 2d05397132e8e803781a0c73c72e8e7d825da1d1
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:32:38 2021 +0100

Fix MethodExpression.getMethodInfo() when parameters are provided
---
 java/org/apache/el/parser/AstValue.java  | 16 
 test/org/apache/el/TestMethodExpressionImpl.java | 14 ++
 webapps/docs/changelog.xml   | 11 +++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index db67312..4db4a50 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -212,10 +212,18 @@ public final class AstValue extends SimpleNode {
 @SuppressWarnings("rawtypes") Class[] paramTypes)
 throws ELException {
 Target t = getTarget(ctx);
-Method m = ReflectionUtil.getMethod(
-ctx, t.base, t.property, paramTypes, null);
-return new MethodInfo(m.getName(), m.getReturnType(), m
-.getParameterTypes());
+Class[] types = null;
+if (isParametersProvided()) {
+if (isParametersProvided()) {
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
+}
+}
+Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
+return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
 }
 
 @Override
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index e8c4abf..c2811bf 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -22,6 +22,7 @@ import javax.el.ELContext;
 import javax.el.ELProcessor;
 import javax.el.ExpressionFactory;
 import javax.el.MethodExpression;
+import javax.el.MethodInfo;
 import javax.el.MethodNotFoundException;
 import javax.el.ValueExpression;
 
@@ -761,4 +762,17 @@ public class TestMethodExpressionImpl {
 String elResult = (String) elp.eval("bean1.echo(bean2)");
 Assert.assertEquals("No varargs: xyz", elResult);
 }
+
+
+@Test
+public void testGetMethodInfo01() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName('New value')}", null, null);
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e2f28ac..b13acc0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,17 @@
   
 
   
+  
+
+  
+Fix the implementation of MethodExpression.getMethodInfo()
+so that it returns the expected value rather than failing when the
+method expression is defined with the parameter values in the 
expression
+rather than the types being passed explicitly to
+ExpressionFactory.createMethodExpression(). (markt) 
+  
+
+  
 
 
   

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

[tomcat] branch 10.0.x updated: Fix MethodExpression.getMethodInfo() when parameters are provided

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 99f38cc  Fix MethodExpression.getMethodInfo() when parameters are 
provided
99f38cc is described below

commit 99f38cc603b873e406d4d33cdc92983046556ffd
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:32:38 2021 +0100

Fix MethodExpression.getMethodInfo() when parameters are provided
---
 java/org/apache/el/parser/AstValue.java  | 16 
 test/org/apache/el/TestMethodExpressionImpl.java | 14 ++
 webapps/docs/changelog.xml   | 11 +++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index 7797e81..53ce2d6 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -212,10 +212,18 @@ public final class AstValue extends SimpleNode {
 @SuppressWarnings("rawtypes") Class[] paramTypes)
 throws ELException {
 Target t = getTarget(ctx);
-Method m = ReflectionUtil.getMethod(
-ctx, t.base, t.property, paramTypes, null);
-return new MethodInfo(m.getName(), m.getReturnType(), m
-.getParameterTypes());
+Class[] types = null;
+if (isParametersProvided()) {
+if (isParametersProvided()) {
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
+}
+}
+Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
+return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
 }
 
 @Override
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index a1b5ade..2178ce7 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -22,6 +22,7 @@ import jakarta.el.ELContext;
 import jakarta.el.ELProcessor;
 import jakarta.el.ExpressionFactory;
 import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
 import jakarta.el.MethodNotFoundException;
 import jakarta.el.ValueExpression;
 
@@ -761,4 +762,17 @@ public class TestMethodExpressionImpl {
 String elResult = (String) elp.eval("bean1.echo(bean2)");
 Assert.assertEquals("No varargs: xyz", elResult);
 }
+
+
+@Test
+public void testGetMethodInfo01() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName('New value')}", null, null);
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 068deb4..b6c4cec 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,17 @@
   
 
   
+  
+
+  
+Fix the implementation of MethodExpression.getMethodInfo()
+so that it returns the expected value rather than failing when the
+method expression is defined with the parameter values in the 
expression
+rather than the types being passed explicitly to
+ExpressionFactory.createMethodExpression(). (markt) 
+  
+
+  
 
 
   

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

[tomcat] branch main updated: Fix MethodExpression.getMethodInfo() when parameters are provided

2021-09-17 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 93dd0c2  Fix MethodExpression.getMethodInfo() when parameters are 
provided
93dd0c2 is described below

commit 93dd0c2e2a15b9e5d37a92b4d435c4f53de3c00d
Author: Mark Thomas 
AuthorDate: Fri Sep 17 21:32:38 2021 +0100

Fix MethodExpression.getMethodInfo() when parameters are provided
---
 java/org/apache/el/parser/AstValue.java  | 16 
 test/org/apache/el/TestMethodExpressionImpl.java | 14 ++
 webapps/docs/changelog.xml   |  7 +++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/el/parser/AstValue.java 
b/java/org/apache/el/parser/AstValue.java
index d926867..5a07ef4 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -213,10 +213,18 @@ public final class AstValue extends SimpleNode {
 @SuppressWarnings("rawtypes") Class[] paramTypes)
 throws ELException {
 Target t = getTarget(ctx);
-Method m = ReflectionUtil.getMethod(
-ctx, t.base, t.property, paramTypes, null);
-return new MethodInfo(m.getName(), m.getReturnType(), m
-.getParameterTypes());
+Class[] types = null;
+if (isParametersProvided()) {
+if (isParametersProvided()) {
+Object[] values = ((AstMethodParameters) this.jjtGetChild(
+this.jjtGetNumChildren() - 1)).getParameters(ctx);
+types = getTypesFromValues(values);
+} else {
+types = paramTypes;
+}
+}
+Method m = ReflectionUtil.getMethod(ctx, t.base, t.property, types, 
null);
+return new MethodInfo(m.getName(), m.getReturnType(), 
m.getParameterTypes());
 }
 
 @Override
diff --git a/test/org/apache/el/TestMethodExpressionImpl.java 
b/test/org/apache/el/TestMethodExpressionImpl.java
index 085a39f..53816ba 100644
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -22,6 +22,7 @@ import jakarta.el.ELContext;
 import jakarta.el.ELProcessor;
 import jakarta.el.ExpressionFactory;
 import jakarta.el.MethodExpression;
+import jakarta.el.MethodInfo;
 import jakarta.el.MethodNotFoundException;
 import jakarta.el.ValueExpression;
 
@@ -761,4 +762,17 @@ public class TestMethodExpressionImpl {
 String elResult = elp.eval("bean1.echo(bean2)");
 Assert.assertEquals("No varargs: xyz", elResult);
 }
+
+
+@Test
+public void testGetMethodInfo01() throws Exception {
+MethodExpression me = factory.createMethodExpression(context,
+"#{beanA.setName('New value')}", null, null);
+// This is the call that failed
+MethodInfo mi = me.getMethodInfo(context);
+// The rest is to check it worked correctly
+Assert.assertEquals(void.class, mi.getReturnType());
+Assert.assertEquals(1, mi.getParamTypes().length);
+Assert.assertEquals(String.class, mi.getParamTypes()[0]);
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 80b359c..ebc8001 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -160,6 +160,13 @@
 NotFoundELResolver. This aligns Tomcat with recent updates
 to the Jakarta Server Pages specification. (markt)
   
+  
+Fix the implementation of MethodExpression.getMethodInfo()
+so that it returns the expected value rather than failing when the
+method expression is defined with the parameter values in the 
expression
+rather than the types being passed explicitly to
+ExpressionFactory.createMethodExpression(). (markt) 
+  
 
   
 

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

ApacheCon 2021 @Home is Next Week!

2021-09-17 Thread Christopher Schultz 

All,

ApacheCon is coming back to your living room / bed room / home office 
next week, Tuesday - Thursday, mostly centered on the US-Eastern time zone.


There is *zero cost* to attend the conference.

https://www.apachecon.com/acah2021/

The Tomcat track is only happening on Tuesday, including a Tomcat BoF[1] 
following the day's scheduled-tracks. We hope you'll join us for any or 
all of the conference.


-chris

[1] "Birds of a Feather", a free-form meeting/discussion about virtually 
any topic


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

[Bug 65577] Intermittent AccessControlException using NIO2 with security manager enabled

2021-09-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65577

--- Comment #3 from David  ---
Thanks for the quick turnaround Mark. We will look into migrating off of
security manager.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Remove an empty line at the end

2021-09-17 Thread mgrigorov 
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new a59bffd  Remove an empty line at the end
a59bffd is described below

commit a59bffdd5ace451d5e234abc390e1e5dcc06510c
Author: Martin Tzvetanov Grigorov 
AuthorDate: Fri Sep 17 15:50:05 2021 +0300

Remove an empty line at the end

Requested-by: Gavin McDonald
Testing Tomcat's Buildbot2's config
---
 test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java 
b/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
index 37c1cfe..2143fac 100644
--- a/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
+++ b/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
@@ -292,4 +292,3 @@ public abstract class DefaultServletEncodingBaseTest 
extends TomcatBaseTest {
 }
 }
 }
-

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

Re: [tomcat] branch main updated: Fix BZ 65563. Correct parsing of Content-Range headers

2021-09-17 Thread Rainer Jung 

Am 09.09.2021 um 09:36 schrieb ma...@apache.org:

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 86bbbc6..aa4aac8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
issues do not "pop up" wrt. others).
  -->
  
+  
+
+  
+65563: Correct parsing of HTTP Content-Rnage


Small typo s/Rnage/Range/
Applies to all active branches.


+headers. Tomcat was incorrectly requiring an = character
+after bytes. Fix based on pull request 449 by
+Thierry Guérin. (markt)
+  
+
+  

  



Thanks and regards,

Rainer

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

[tomcat] branch main updated: Add an empty line at the end

2021-09-17 Thread mgrigorov 
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new f1a4948  Add an empty line at the end
f1a4948 is described below

commit f1a49482eb75551e762a12516a5a2e7330ba0879
Author: Martin Tzvetanov Grigorov 
AuthorDate: Fri Sep 17 13:41:23 2021 +0300

Add an empty line at the end

Requested-by: Gavin McDonald
Testing Tomcat's Buildbot2's config
---
 test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java 
b/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
index 2143fac..37c1cfe 100644
--- a/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
+++ b/test/org/apache/catalina/servlets/DefaultServletEncodingBaseTest.java
@@ -292,3 +292,4 @@ public abstract class DefaultServletEncodingBaseTest 
extends TomcatBaseTest {
 }
 }
 }
+

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

[tomcat] branch main updated: Update the links to 10.0.x and 10.1.x documentation

2021-09-17 Thread mgrigorov 
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 67b2efc  Update the links to 10.0.x and 10.1.x documentation
67b2efc is described below

commit 67b2efc1ad0f8bd481b12865a8cf6f794bae36ce
Author: Martin Tzvetanov Grigorov 
AuthorDate: Fri Sep 17 13:34:45 2021 +0300

Update the links to 10.0.x and 10.1.x documentation
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ab9b9c2..dedb841 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,8 @@ The documentation available as of the date of this release is
 included in the docs webapp which ships with tomcat. You can access that webapp
 by starting tomcat and visiting  in your browser.
 The most up-to-date documentation for each version can be found at:
-- [Tomcat 10](https://tomcat.apache.org/tomcat-10.1-doc/)
+- [Tomcat 10.1](https://tomcat.apache.org/tomcat-10.1-doc/)
+- [Tomcat 10.0](https://tomcat.apache.org/tomcat-10.0-doc/)
 - [Tomcat 9](https://tomcat.apache.org/tomcat-9.0-doc/)
 - [Tomcat 8](https://tomcat.apache.org/tomcat-8.5-doc/)
 - [Tomcat 7](https://tomcat.apache.org/tomcat-7.0-doc/)

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

[tomcat] branch main updated: Test Buildbot2 build. Requested-by: Gavin

2021-09-17 Thread mgrigorov 
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new 2babd6d  Test Buildbot2 build. Requested-by: Gavin
2babd6d is described below

commit 2babd6dd10bbd24b0e56cabb558febf4891d043c
Author: Martin Tzvetanov Grigorov 
AuthorDate: Fri Sep 17 13:25:50 2021 +0300

Test Buildbot2 build. Requested-by: Gavin

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

[Bug 65577] Intermittent AccessControlException using NIO2 with security manager enabled

2021-09-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=65577

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Fixed in:
- 10.1.x for 10.1.0-M6 onwards
- 10.0.x for 10.0.12 onwards
- 9.0.x for 9.0.54 onwards
- 8.5.x for 8.5.72 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org