Author: markt
Date: Thu May 15 10:07:31 2008
New Revision: 656739
URL: http://svn.apache.org/viewvc?rev=656739&view=rev
Log:
Improved fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44968 as a
single patch
Provide more information when keystore load fails
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=656739&r1=656738&r2=656739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Thu May 15 10:07:31 2008
@@ -321,13 +321,18 @@
ks.load(istream, pass.toCharArray());
} catch (FileNotFoundException fnfe) {
+ log.error(sm.getString("jsse.keystore_load_failed", type, path,
+ fnfe.getMessage()), fnfe);
throw fnfe;
} catch (IOException ioe) {
+ log.error(sm.getString("jsse.keystore_load_failed", type, path,
+ ioe.getMessage()), ioe);
throw ioe;
} catch(Exception ex) {
- log.error("Exception trying to load keystore " +path,ex);
- throw new IOException("Exception trying to load keystore " +
- path + ": " + ex.getMessage() );
+ String msg = sm.getString("jsse.keystore_load_failed", type, path,
+ ex.getMessage());
+ log.error(msg, ex);
+ throw new IOException(msg);
} finally {
if (istream != null) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
