cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clecl...@apache.org
Subject svn commit: r920753 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
Date Tue, 09 Mar 2010 09:34:27 GMT
Author: cleclerc
Date: Tue Mar  9 09:34:26 2010
New Revision: 920753

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

........
  r920752 | cleclerc | 2010-03-09 10:32:34 +0100 (Tue, 09 Mar 2010) | 1 line
  
  [CXF-2693] fix java 1.5 compatibility issue
........

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/https/HttpsURLConnectionFactory.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  9 09:34:26 2010
@@ -1 +1 @@
-/cxf/trunk:920741
+/cxf/trunk:920741,920752

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/https/HttpsURLConnectionFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=920753&r1=920752&r2=920753&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
Tue Mar  9 09:34:26 2010
@@ -130,7 +130,10 @@ public final class HttpsURLConnectionFac
                     if (ex instanceof IOException) {
                         throw (IOException) ex;
                     }
-                    throw new IOException("Error while initializing secure socket", ex);
+                    // use exception.initCause(ex) to be java 5 compatible
+                    IOException ioException = new IOException("Error while initializing secure
socket");
+                    ioException.initCause(ex);
+                    throw ioException;
                 }
             }
         }



Mime
View raw message