You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/05/20 11:59:17 UTC

svn commit: r1484411 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java

Author: sergeyb
Date: Mon May 20 09:59:16 2013
New Revision: 1484411

URL: http://svn.apache.org/r1484411
Log:
Merged revisions 1484408,1484410 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1484408 | sergeyb | 2013-05-20 10:42:45 +0100 (Mon, 20 May 2013) | 1 line
  
  Replacing Exception with Throwable in JAXRS client code to get another 1.1 and 2.0 API mix-up issue handled
........
  r1484410 | sergeyb | 2013-05-20 10:57:09 +0100 (Mon, 20 May 2013) | 1 line
  
  Replacing Exception with Throwable in JAXRS client code: one more update for CL issues not actually be reported as WAE causes
........

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/client/AbstractClient.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1484408-1484410

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/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1484411&r1=1484410&r2=1484411&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java Mon May 20 09:59:16 2013
@@ -450,8 +450,8 @@ public abstract class AbstractClient imp
         try {
             Constructor<?> ctr = exceptionClass.getConstructor(Response.class);
             return (WebApplicationException)ctr.newInstance(r);
-        } catch (Exception ex2) {
-            return new WebApplicationException(ex2, r);
+        } catch (Throwable ex2) {
+            return new WebApplicationException(r);
         }
     }