svn commit: r1391394 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java

[sergeyb]

Author: sergeyb
Date: Fri Sep 28 10:58:44 2012
New Revision: 1391394

URL: http://svn.apache.org/viewvc?rev=1391394&view=rev
Log:
Merged revisions 1391390 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1391390 | sergeyb | 2012-09-28 11:44:35 +0100 (Fri, 28 Sep 2012) | 1 line
  
  [CXF-4496] Updating proxy code to check for WebApplicationException response 
mapper in case of HTTP errors and no exception types available in the signature
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1391390

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1391394&r1=1391393&r2=1391394&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
 Fri Sep 28 10:58:44 2012
@@ -298,7 +298,11 @@ public class ClientProxyImpl extends Abs
     
     private static ResponseExceptionMapper<?> findExceptionMapper(Method m, 
Message message) {
         ProviderFactory pf = ProviderFactory.getInstance(message);
-        for (Class<?> exType : m.getExceptionTypes()) {
+        Class<?>[] exTypes = m.getExceptionTypes();
+        if (exTypes.length == 0) {
+            exTypes = new Class[]{ServerWebApplicationException.class};
+        }
+        for (Class<?> exType : exTypes) {
             ResponseExceptionMapper<?> mapper = 
pf.createResponseExceptionMapper(exType);
             if (mapper != null) {
                 return mapper;