You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2021/04/06 09:53:09 UTC
[cxf] branch 3.4.x-fixes updated (d07fea0 -> f6cac78)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from d07fea0 Added tests for WebClient::language() and Variant
new 0b49369 Updating woodstox to 6.2.5
new 22b225f Updating the owasp maven plugin to 6.1.5
new 70ced32 Avoid a possible ArrayIndexOutOfBoundsException in ClientProxyImpl
new f6cac78 Recording .gitmergeinfo Changes
The 4 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:
.gitmergeinfo | 1 +
parent/pom.xml | 2 +-
pom.xml | 2 +-
.../src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 5 +++--
4 files changed, 6 insertions(+), 4 deletions(-)
[cxf] 04/04: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f6cac785f26b40a347a3839502ac007443ba03d0
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 6 10:40:23 2021 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f239992..fc74d6d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -64,6 +64,7 @@ B ebf96ece52588ae1509d1fbe63fae43571c18116
B ee2e5ee16fe802cc1f4010b59b73c5ef53777429
B eeacfd4bdaeee2bf89fb5ef0743608838dd96efd
B f1ef4ca9c4a7d99b6d846b6401410ca3eb637cc2
+B f25e730dd9000f2119ee972295cc7adaf6fdbb07
B f315acdde42f967102c7503d46d1edbb3affc210
B f37825ad081b58ffd69203e834cf3fe10238d7d2
B f557480af9d85150fc22ec52f9e9285e05631b5a
[cxf] 02/04: Updating the owasp maven plugin to 6.1.5
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 22b225fbad422134b7ea14e6b20693bbfcc0a2e9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 6 10:08:26 2021 +0100
Updating the owasp maven plugin to 6.1.5
(cherry picked from commit 62c33440133cde9bead8e673e7dc29aee275647d)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3158686..89e9abe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<cxf.jdk.version>1.8</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
- <maven-owasp-plugin-version>6.0.4</maven-owasp-plugin-version>
+ <maven-owasp-plugin-version>6.1.5</maven-owasp-plugin-version>
</properties>
<distributionManagement>
<repository>
[cxf] 01/04: Updating woodstox to 6.2.5
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0b4936914706288e5459127fb8f6d9bc2f105136
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 6 10:08:15 2021 +0100
Updating woodstox to 6.2.5
(cherry picked from commit 9d4fa7b2950512adc4249a3dc9c5c578bbb2bd7e)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 64dd320..1442298 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -218,7 +218,7 @@
<cxf.validation.api.version>2.0.2</cxf.validation.api.version>
<cxf.velocity.version>2.3</cxf.velocity.version>
<cxf.wiremock.version>2.23.2</cxf.wiremock.version>
- <cxf.woodstox.core.version>6.2.4</cxf.woodstox.core.version>
+ <cxf.woodstox.core.version>6.2.5</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>2.3.1</cxf.wss4j.version>
[cxf] 03/04: Avoid a possible ArrayIndexOutOfBoundsException in
ClientProxyImpl
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 70ced3220f319331094448858df835f9100cb857
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 6 10:08:53 2021 +0100
Avoid a possible ArrayIndexOutOfBoundsException in ClientProxyImpl
(cherry picked from commit 42ddaa3041b79042e2bd75945cad191dbc294bbc)
---
.../src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 8f83be2..8937909 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -1085,8 +1085,9 @@ public class ClientProxyImpl extends AbstractClient implements
Annotation[] anns = customAnns != null ? customAnns
: getMethodAnnotations(ori.getAnnotatedMethod(), bodyIndex);
try {
- if (bodyIndex != -1) {
- Class<?> paramClass = method.getParameterTypes()[bodyIndex];
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ if (bodyIndex >= 0 && bodyIndex < parameterTypes.length) {
+ Class<?> paramClass = parameterTypes[bodyIndex];
Class<?> bodyClass =
paramClass.isAssignableFrom(body.getClass()) ? paramClass : body.getClass();
Type genericType = bodyType;