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 10:05:55 UTC
[cxf] branch 3.3.x-fixes updated (a612c6c -> d22d1c6)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from a612c6c Recording .gitmergeinfo Changes
new d94491c Avoid a possible ArrayIndexOutOfBoundsException in ClientProxyImpl
new d22d1c6 Recording .gitmergeinfo Changes
The 2 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 | 4 ++++
.../src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
[cxf] 01/02: 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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d94491c709842900c47fec10bd65a92efd3d265c
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)
(cherry picked from commit 70ced3220f319331094448858df835f9100cb857)
---
.../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 94a4acf..59ca9b5 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
@@ -1087,8 +1087,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 = method.getGenericParameterTypes()[bodyIndex];
[cxf] 02/02: 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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d22d1c6a2a38511593773392d0e7e62c42d7c7a6
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 6 10:55:28 2021 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 13bacb5..dcad4c4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -20,6 +20,7 @@ B 0a961b125c0f81fc8d130ad99cc2c986e0dcdfb0
B 0af6ac03b35075a5729023ab3b15c8daf1a55347
B 0b0ac33200a39d567a522588bfe67a9321d49733
B 0b1c413071a7c4c933667d6ab21e2bb51252163c
+B 0b4936914706288e5459127fb8f6d9bc2f105136
B 0b62006a7519f14f97330342d25e2d450cdbfa7c
B 0b7580839ddcd7879aa3f14576ea959a1aa872bc
B 0bd7ffeb9e599718ff1279f1b86df7c1e13a8ca4
@@ -87,6 +88,7 @@ B 212b83f2da31deff076e5869a30563a90d633aea
B 214e375e1a3771ece687294c4313da0641bea99b
B 218fec091a7626adc6dba9e25454c2b080576ea6
B 21a297f885b486022705065001f418d28263a516
+B 22b225fbad422134b7ea14e6b20693bbfcc0a2e9
B 22df51a8d75e3807e4765efd89cb5e5b76b3ef7e
B 23e18bb6dfbe081027609c8d5efcb296eefcdb3b
B 2425fad2eb3a31b643e4f6d23115f3dc146027a7
@@ -606,6 +608,7 @@ B f63582f4f39c76c2152ea67626b21326d81e6845
B f65092143ec9b069c5db03ba1eb71aeb76cc0306
B f654f82ecac36a5a2e1d8d2d05d7c94ede9488fc
B f68556e5b8f2fb54a6e42c48068bfc3a85996720
+B f6cac785f26b40a347a3839502ac007443ba03d0
B f6d5026ce93ed9bd2169e004680b8749d1afd809
B f6d7593cc52cc406ba4d837b4eeca042ec796909
B f82b1f6acafb50f4b4ab4c75e6013d7c59025b6c
@@ -751,6 +754,7 @@ M 6f79756afa8a0cf90a7132929cc387f6f1d21ba0
M 6fb1e66cb2336c0e4564e8ddf02b16e9d43d53bd
M 706dd02fd37597967a10d5a5c1ad526b995f88ea
M 70c7d6a1e3f23522609d58b72b61c52e3cbc919a
+M 70ced3220f319331094448858df835f9100cb857
M 727c2b8e70f6f8282ad2431703e88063f27d69c4
M 743ef459be7a1a7d17cb3b67780daf06eb5356c2
M 752a8a2dafff76ed8098cd73f1e071ffa0514754