cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r881085 - in /cxf/branches/2.1.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 Tue, 17 Nov 2009 01:27:30 GMT
Author: dkulp
Date: Tue Nov 17 01:27:28 2009
New Revision: 881085

URL: http://svn.apache.org/viewvc?rev=881085&view=rev
Log:
Merged revisions 881005 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r881005 | dkulp | 2009-11-16 17:14:14 -0500 (Mon, 16 Nov 2009) | 9 lines
  
  Merged revisions 880992 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r880992 | dkulp | 2009-11-16 17:04:07 -0500 (Mon, 16 Nov 2009) | 1 line
    
    [CXF-2537] Even better error message
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java

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

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=881085&r1=881084&r2=881085&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Tue Nov 17 01:27:28 2009
@@ -1938,12 +1938,19 @@
             try {
                 handleResponse();
             } catch (IOException e) {
+                String url = connection.getURL().toString();
+                String origMessage = e.getMessage();
+                if (origMessage != null && origMessage.contains(url)) {
+                    throw e;
+                }
                 throw mapException(e.getClass().getSimpleName() 
-                                   + " invoking " + connection.getURL(), e,
+                                   + " invoking " + connection.getURL() + ": "
+                                   + e.getMessage(), e,
                                    IOException.class);
             } catch (RuntimeException e) {
                 throw mapException(e.getClass().getSimpleName() 
-                                   + " invoking " + connection.getURL(), e,
+                                   + " invoking " + connection.getURL() + ": "
+                                   + e.getMessage(), e,
                                    RuntimeException.class);
             } finally {
                 if (cachingForRetransmission && cachedStream != null) {
@@ -1951,7 +1958,8 @@
                 }
             }
         }
-        private <T extends Exception> T mapException(String msg, T ex, Class<T>
cls) {
+        private <T extends Exception> T mapException(String msg, 
+                                                     T ex, Class<T> cls) {
             T ex2 = ex;
             try {
                 ex2 = cls.cast(ex.getClass().getConstructor(String.class).newInstance(msg));

Modified: cxf/branches/2.1.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.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java?rev=881085&r1=881084&r2=881085&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java
Tue Nov 17 01:27:28 2009
@@ -153,7 +153,7 @@
             greeter.greetMe("cxf");
             fail("Didn't get the exception");
         } catch (Exception ex) {
-            ex.printStackTrace();
+            //ex.printStackTrace();
             assertTrue(ex.getCause().getClass().getName(), ex.getCause() instanceof SocketTimeoutException);
         }
      



Mime
View raw message