From 041c943441c76d9af5ba874e8c8e4c928354fa2b Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 15 May 2008 17:01:47 +0000 Subject: [PATCH] Revert previous 3 commits to create clean patch for 6.0.x git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@656738 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java index 31f6cc58b..9538edbac 100644 --- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java +++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java @@ -321,18 +321,13 @@ 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) { - String msg = sm.getString("jsse.keystore_load_failed", type, path, - ex.getMessage()); - log.error(msg, ex); - throw new IOException(msg); + log.error("Exception trying to load keystore " +path,ex); + throw new IOException("Exception trying to load keystore " + + path + ": " + ex.getMessage() ); } finally { if (istream != null) { try { -- 2.11.0