tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r656738 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Date Thu, 15 May 2008 17:01:47 GMT
Author: markt
Date: Thu May 15 10:01:47 2008
New Revision: 656738

URL: http://svn.apache.org/viewvc?rev=656738&view=rev
Log:
Revert previous 3 commits to create clean patch for 6.0.x

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=656738&r1=656737&r2=656738&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:01:47
2008
@@ -321,18 +321,13 @@
 
             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 {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message