Author: sergeyb
Date: Tue Jul 9 20:11:35 2013
New Revision: 1501516
URL: http://svn.apache.org/r1501516
Log:
Merged revisions 1501510 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1501510 | sergeyb | 2013-07-09 21:06:58 +0100 (Tue, 09 Jul 2013) | 1 line
Minor fix to get JAXRS test dealing with arrays passing on Java 7
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1501510
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1501516&r1=1501515&r2=1501516&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Tue Jul 9 20:11:35 2013
@@ -450,7 +450,7 @@ public final class ProviderFactory {
if (actualClass == null) {
continue;
}
- if (expectedType.isArray()) {
+ if (expectedType.isArray() && !actualClass.isArray()) {
expectedType = expectedType.getComponentType();
}
if (actualClass.isAssignableFrom(expectedType)) {
