Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 17098 invoked from network); 16 Nov 2009 22:13:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Nov 2009 22:13:53 -0000 Received: (qmail 25019 invoked by uid 500); 16 Nov 2009 22:13:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 24933 invoked by uid 500); 16 Nov 2009 22:13:53 -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 24924 invoked by uid 99); 16 Nov 2009 22:13:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Nov 2009 22:13:53 +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; Mon, 16 Nov 2009 22:13:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6015623889D1; Mon, 16 Nov 2009 22:13:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r881003 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java Date: Mon, 16 Nov 2009 22:13:29 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091116221329.6015623889D1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Nov 16 22:13:28 2009 New Revision: 881003 URL: http://svn.apache.org/viewvc?rev=881003&view=rev Log: Merged revisions 880991 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r880991 | dkulp | 2009-11-16 17:03:54 -0500 (Mon, 16 Nov 2009) | 4 lines [CXF-2537] Enhance the error messages on the client side for http conduits. Heavily modified patch from Cyrille Le Clerc applied. ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=881003&r1=881002&r2=881003&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Mon Nov 16 22:13:28 2009 @@ -1980,13 +1980,32 @@ } try { handleResponse(); + } catch (IOException e) { + throw mapException(e.getClass().getSimpleName() + + " invoking " + connection.getURL(), e, + IOException.class); + } catch (RuntimeException e) { + throw mapException(e.getClass().getSimpleName() + + " invoking " + connection.getURL(), e, + RuntimeException.class); } finally { if (cachingForRetransmission && cachedStream != null) { cachedStream.close(); } } } - + private T mapException(String msg, T ex, Class cls) { + T ex2 = ex; + try { + ex2 = cls.cast(ex.getClass().getConstructor(String.class).newInstance(msg)); + ex2.initCause(ex); + } catch (Throwable e) { + ex2 = ex; + } + + + return ex2; + } /** * This procedure handles all retransmits, if any. @@ -2106,7 +2125,8 @@ if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) { - throw new IOException(connection.getResponseMessage()); + throw new IOException("HTTP response '" + responseCode + ": " + + connection.getResponseMessage() + "'"); } Modified: cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java?rev=881003&r1=881002&r2=881003&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java (original) +++ cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java Mon Nov 16 22:13:28 2009 @@ -149,6 +149,7 @@ greeter.greetMe("cxf"); fail("Didn't get the exception"); } catch (Exception ex) { + ex.printStackTrace(); assertTrue(ex.getCause().getClass().getName(), ex.getCause() instanceof SocketTimeoutException); }