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 jb...@apache.org on 2001/12/12 21:13:25 UTC
cvs commit: jakarta-jmeter/src/org/apache/jmeter/util ClassFinder.java SSLManager.java
jboutcher 01/12/12 12:13:25
Modified: src/org/apache/jmeter/util ClassFinder.java SSLManager.java
Log:
Fix for bug #5097 - Cleanup of NullPointerExceptions on Startup
Revision Changes Path
1.16 +5 -2 jakarta-jmeter/src/org/apache/jmeter/util/ClassFinder.java
Index: ClassFinder.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/ClassFinder.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ClassFinder.java 2001/09/24 12:02:27 1.15
+++ ClassFinder.java 2001/12/12 20:13:24 1.16
@@ -1186,6 +1186,9 @@
{
+ // Class.forName() doesn't like nulls
+ if(strClassName == null) continue;
+
c = Class.forName(strClassName);
if (!c.isInterface() && !Modifier.isAbstract(c.getModifiers()))
@@ -1452,11 +1455,11 @@
*
- *@author $Author: mstover1 $
+ *@author $Author: jboutcher $
- *@created $Date: 2001/09/24 12:02:27 $
+ *@created $Date: 2001/12/12 20:13:24 $
- *@version $Revision: 1.15 $
+ *@version $Revision: 1.16 $
***********************************************************/
1.13 +15 -6 jakarta-jmeter/src/org/apache/jmeter/util/SSLManager.java
Index: SSLManager.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/util/SSLManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SSLManager.java 2001/11/09 20:34:53 1.12
+++ SSLManager.java 2001/12/12 20:13:25 1.13
@@ -74,7 +74,7 @@
* make a decision, it will pop open a dialog asking you for more information.
*
* @author <a href="bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.12 $ $Date: 2001/11/09 20:34:53 $
+ * @version CVS $Revision: 1.13 $ $Date: 2001/12/12 20:13:25 $
*/
public abstract class SSLManager {
/** Singleton instance of the manager */
@@ -273,18 +273,27 @@
// moved from SSLStaticProvider so all SSL specific management is done in one place.
static
{
+
+ SSLManager.isSSLSupported = false;
+ SSLManager.sslProvider = null;
+
try {
- SSLManager.sslProvider = (Provider)Class.forName(JMeterUtils.getPropDefault("ssl.provider",null)).newInstance();
+ // Class.forName() was choking if the property wasn't set on the line below..
+ String strSSLProvider = JMeterUtils.getPropDefault("ssl.provider",null);
+ if(strSSLProvider != null) {
+ SSLManager.sslProvider = (Provider)Class.forName(strSSLProvider).newInstance();
+ SSLManager.isSSLSupported = true;
+ }
} catch (Exception noSSL) {
noSSL.printStackTrace(System.err);
- SSLManager.isSSLSupported = false;
- SSLManager.sslProvider = null;
}
try {
- System.out.println("SSL Provider is: " + SSLManager.sslProvider);
- Security.addProvider(SSLManager.sslProvider);
+ if(SSLManager.sslProvider != null) {
+ System.out.println("SSL Provider is: " + SSLManager.sslProvider);
+ Security.addProvider(SSLManager.sslProvider);
// register jsse provider
+ }
} catch (Exception ssl) {
// ignore
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>