Author: sebb
Date: Fri Feb 2 14:24:47 2007
New Revision: 502781
URL: http://svn.apache.org/viewvc?view=rev&rev=502781
Log:
Make log messages clearer; give access to string constant
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=502781&r1=502780&r2=502781
==============================================================================
---
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
Fri Feb 2 14:24:47 2007
@@ -52,7 +52,7 @@
private static final String KEY_STORE_PASSWORD =
"javax.net.ssl.keyStorePassword"; // $NON-NLS-1$
- private static final String JAVAX_NET_SSL_KEY_STORE =
"javax.net.ssl.keyStore"; // $NON-NLS-1$
+ public static final String JAVAX_NET_SSL_KEY_STORE =
"javax.net.ssl.keyStore"; // $NON-NLS-1$
private static final String PKCS12 = "pkcs12"; // $NON-NLS-1$
@@ -152,10 +152,11 @@
fileInputStream = new
FileInputStream(initStore);
this.keyStore.load(fileInputStream, password);
} else {
+ log.warn("Keystore not found, creating
empty keystore");
this.keyStore.load(null, password);
}
} catch (Exception e) {
- log.error("Couldn't load keystore", e);
+ log.warn("Problem loading keystore: "
+e.getMessage()); // Does not seem to matter much
} finally {
JOrphanUtils.closeQuietly(fileInputStream);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
