Author: coheigea Date: Wed Aug 14 15:40:31 2013 New Revision: 1513935 URL: http://svn.apache.org/r1513935 Log: Merged revisions 1513931 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1513931 | coheigea | 2013-08-14 16:34:24 +0100 (Wed, 14 Aug 2013) | 10 lines Merged revisions 1513930 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1513930 | coheigea | 2013-08-14 16:32:51 +0100 (Wed, 14 Aug 2013) | 2 lines [CXF-5205] - Client SSL Cache Timeout default is specified in milliseconds rather than seconds ........ ........ Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java?rev=1513935&r1=1513934&r2=1513935&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java Wed Aug 14 15:40:31 2013 @@ -29,7 +29,7 @@ import javax.net.ssl.SSLSocketFactory; public class TLSClientParameters extends TLSParameterBase { private boolean disableCNCheck; private SSLSocketFactory sslSocketFactory; - private int sslCacheTimeout = 86400000; + private int sslCacheTimeout = 86400; private boolean useHttpsURLConnectionDefaultSslSocketFactory; private boolean useHttpsURLConnectionDefaultHostnameVerifier; @@ -69,14 +69,14 @@ public class TLSClientParameters extends } /** - * Returns the SSL cache timeout if it has been configured or the JDK default value + * Returns the SSL cache timeout in seconds if it has been configured or the default value */ public int getSslCacheTimeout() { return sslCacheTimeout; } /** - * This sets the SSL Session Cache timeout value for client sessions handled by CXF + * This sets the SSL Session Cache timeout value in seconds for client sessions handled by CXF */ public void setSslCacheTimeout(int sslCacheTimeout) { this.sslCacheTimeout = sslCacheTimeout; Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java?rev=1513935&r1=1513934&r2=1513935&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java Wed Aug 14 15:40:31 2013 @@ -121,7 +121,7 @@ public class TLSParameterBase { } /** - * This sets the secure random provider and alogorithm. If left unset or set + * This sets the secure random provider and algorithm. If left unset or set * to null, it uses the system default. */ public final void setSecureRandom(SecureRandom random) { @@ -143,7 +143,7 @@ public class TLSParameterBase { } /** - * Returns the secure random alogorithm. + * Returns the secure random algorithm. */ public SecureRandom getSecureRandom() { return secureRandom;
