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

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index 31f6cc5..9538edb 100644 (file)
--- 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 {