Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 82245 invoked from network); 15 May 2008 17:07:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 May 2008 17:07:59 -0000 Received: (qmail 43980 invoked by uid 500); 15 May 2008 17:07:54 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 43910 invoked by uid 500); 15 May 2008 17:07:54 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 43899 invoked by uid 500); 15 May 2008 17:07:54 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 43896 invoked by uid 99); 15 May 2008 17:07:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 May 2008 10:07:54 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 May 2008 17:07:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E5B63238896E; Thu, 15 May 2008 10:07:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r656739 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Date: Thu, 15 May 2008 17:07:31 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080515170731.E5B63238896E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org