svn commit: r1371405 - /cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

[dkulp]

Author: dkulp
Date: Thu Aug  9 19:25:08 2012
New Revision: 1371405

URL: http://svn.apache.org/viewvc?rev=1371405&view=rev
Log:
Merged revisions 1368470 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1368470 | gmazza | 2012-08-02 09:37:18 -0400 (Thu, 02 Aug 2012) | 2 lines

  Clarified error message in case of CN mismatches between server cert and 
HTTPS URL address

........

Modified:
    
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: 
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1371405&r1=1371404&r2=1371405&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 Thu Aug  9 19:25:08 2012
@@ -1352,9 +1352,9 @@ public class HTTPConduit 
             } catch (IOException e) {
                 if (e.getMessage() != null && e.getMessage().contains("HTTPS 
hostname wrong:")) {
                     throw new IOException("The https URL hostname does not 
match the " 
-                        + "Common Name (CN) on the server certificate.  To 
disable this check " 
-                        + "(NOT recommended for production) set the CXF client 
TLS configuration " 
-                        + "property \"disableCNCheck\" to true.");
+                        + "Common Name (CN) on the server certificate in the 
client's truststore.  " 
+                        + "To disable this check (NOT recommended for 
production) set the CXF " 
+                        + "client TLS configuration property 
\"disableCNCheck\" to true.");
                 } else {
                     throw e;
                 }