Author: sebb
Date: Tue Jun 12 15:42:31 2007
New Revision: 546655
URL: http://svn.apache.org/viewvc?view=rev&rev=546655
Log:
No need for reflection as we only use JsseSSLManager now.
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java?view=diff&rev=546655&r1=546654&r2=546655
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java
Tue Jun 12 15:42:31 2007
@@ -20,7 +20,6 @@
import java.io.File;
import java.io.FileInputStream;
-import java.lang.reflect.Constructor;
import java.net.HttpURLConnection;
import java.security.KeyStore;
import java.security.Provider;
@@ -247,21 +246,21 @@
*/
public static final SSLManager getInstance() {
if (null == SSLManager.manager) {
- if (SSLManager.isSSLSupported) {
- String classname = null;
- // TODO - there used to be a choice of
managers. Perhaps tidy code now there is only one?
- classname =
"org.apache.jmeter.util.JsseSSLManager"; // $NON-NLS-1$
-
- try {
- Class clazz = Class.forName(classname);
- Constructor con =
clazz.getConstructor(new Class[] { Provider.class });
- SSLManager.manager = (SSLManager)
con.newInstance(new Object[] { SSLManager.sslProvider });
- } catch (Exception e) {
- log.error("Could not create SSLManager
instance", e); // $NON-NLS-1$
- SSLManager.isSSLSupported = false;
- return null;
- }
- }
+ return new JsseSSLManager(SSLManager.sslProvider);
+// if (SSLManager.isSSLSupported) {
+// String classname = null;
+// classname =
"org.apache.jmeter.util.JsseSSLManager"; // $NON-NLS-1$
+//
+// try {
+// Class clazz = Class.forName(classname);
+// Constructor con =
clazz.getConstructor(new Class[] { Provider.class });
+// SSLManager.manager = (SSLManager)
con.newInstance(new Object[] { SSLManager.sslProvider });
+// } catch (Exception e) {
+// log.error("Could not create SSLManager
instance", e); // $NON-NLS-1$
+// SSLManager.isSSLSupported = false;
+// return null;
+// }
+// }
}
return SSLManager.manager;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
