Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 84114 invoked from network); 31 Aug 2010 20:55:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 31 Aug 2010 20:55:34 -0000 Received: (qmail 15110 invoked by uid 500); 31 Aug 2010 20:55:34 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 15042 invoked by uid 500); 31 Aug 2010 20:55:34 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 15034 invoked by uid 99); 31 Aug 2010 20:55:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Aug 2010 20:55:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Aug 2010 20:55:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A544E23889CB; Tue, 31 Aug 2010 20:54:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991324 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Date: Tue, 31 Aug 2010 20:54:13 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100831205413.A544E23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Aug 31 20:54:13 2010 New Revision: 991324 URL: http://svn.apache.org/viewvc?rev=991324&view=rev Log: [CXF-2961] Applying a patch on behalf of Peter Easton, thanks Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=991324&r1=991323&r2=991324&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Tue Aug 31 20:54:13 2010 @@ -598,6 +598,7 @@ public class WebClient extends AbstractC protected Response doChainedInvocation(String httpMethod, MultivaluedMap headers, Object body, Class responseClass, Type genericType) { + Throwable primaryError = null; URI uri = getCurrentURI(); Message m = createMessage(httpMethod, headers, uri); @@ -613,12 +614,18 @@ public class WebClient extends AbstractC try { m.getInterceptorChain().doIntercept(m); + primaryError = m.getExchange().get(Exception.class); } catch (Throwable ex) { - // we'd like a user to get the whole Response anyway if needed + primaryError = ex; } + // TODO : this needs to be done in an inbound chain instead HttpURLConnection connect = (HttpURLConnection)m.get(HTTPConduit.KEY_HTTP_CONNECTION); + if (connect == null && primaryError != null) { + /** do we have a pre-connect error ? */ + throw new WebApplicationException(primaryError); + } return handleResponse(connect, m, responseClass, genericType); }