From 006c82157fe87fc67e93d67051cc7f3489c4680e Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 15 May 2008 17:07:31 +0000 Subject: [PATCH] Improved fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44968 as a single patch Provide more information when keystore load fails git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@656739 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java index 9538edbac..31f6cc58b 100644 --- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java +++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java @@ -321,13 +321,18 @@ public class JSSESocketFactory 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 { -- 2.11.0