You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/04/17 21:27:03 UTC
svn commit: r394757 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/SSLManager.java
Author: sebb
Date: Mon Apr 17 12:27:02 2006
New Revision: 394757
URL: http://svn.apache.org/viewcvs?rev=394757&view=rev
Log:
Replace static section by field initialisation
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/SSLManager.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/SSLManager.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/SSLManager.java?rev=394757&r1=394756&r2=394757&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/SSLManager.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/SSLManager.java Mon Apr 17 12:27:02 2006
@@ -58,7 +58,7 @@
/** Singleton instance of the manager */
private static SSLManager manager;
- private static boolean isSSLSupported = false;
+ private static boolean isSSLSupported = true;
private static Provider sslProvider = null;
@@ -176,7 +176,7 @@
try {
this.trustStore = KeyStore.getInstance("JKS");
- log.info("KeyStore Type: JKS");
+ log.info("TrustStore Type: JKS");
} catch (Exception e) {
JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(), e, JMeterUtils
.getResString("ssl_error_title"), // $NON-NLS-1$
@@ -245,10 +245,5 @@
*/
public static final boolean isSSLSupported() {
return SSLManager.isSSLSupported;
- }
-
- static {
- SSLManager.isSSLSupported = true;
- SSLManager.sslProvider = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org