Author: dkulp
Date: Fri May 7 15:00:34 2010
New Revision: 942093
URL: http://svn.apache.org/viewvc?rev=942093&view=rev
Log:
Merged revisions 942082 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r942082 | dkulp | 2010-05-07 10:23:48 -0400 (Fri, 07 May 2010) | 1 line
Fix compile failure with strange non-UTF-8 chars
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java?rev=942093&r1=942092&r2=942093&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
(original)
+++
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
Fri May 7 15:00:34 2010
@@ -67,7 +67,7 @@ public class TLSClientParameters extends
}
/**
- * Returns whether or not {...@link
javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()}Êshould be
+ * Returns whether or not {...@link
javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()} should be
* used to create https connections. If <code>true</code> , {...@link
#getJsseProvider()} ,
* {...@link #getSecureSocketProtocol()}, {...@link #getTrustManagers()},
{...@link #getKeyManagers()},
* {...@link #getSecureRandom()}, {...@link #getCipherSuites()} and
{...@link #getCipherSuitesFilter()} are
@@ -78,7 +78,7 @@ public class TLSClientParameters extends
}
/**
- * Sets whether or not {...@link
javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()}Êshould be
+ * Sets whether or not {...@link
javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()} should be
* used to create https connections.
*
* @see #isUseHttpsURLConnectionDefaultSslSocketFactory()
