cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1501510 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Date Tue, 09 Jul 2013 20:06:58 GMT
Author: sergeyb
Date: Tue Jul  9 20:06:58 2013
New Revision: 1501510

URL: http://svn.apache.org/r1501510
Log:
Minor fix to get JAXRS test dealing with arrays passing on Java 7

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1501510&r1=1501509&r2=1501510&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Tue Jul  9 20:06:58 2013
@@ -307,7 +307,7 @@ public abstract class ProviderFactory {
                     if (actualClass == null) {
                         continue;
                     }
-                    if (expectedType.isArray()) {
+                    if (expectedType.isArray() && !actualClass.isArray()) {
                         expectedType = expectedType.getComponentType();
                     }
                     if (actualClass.isAssignableFrom(expectedType)) {



Mime
View raw message