Author: remy.maucherat(a)jboss.com Date: 2008-05-15 17:36:28 -0400 (Thu, 15 May 2008) New Revision: 626 Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties trunk/java/org/jboss/web/cluster/ClusterListener.java trunk/webapps/docs/changelog.xml Log: - Port keystore load fail patch. Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-05-14 20:52:11 UTC (rev 625) +++ trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-05-15 21:36:28 UTC (rev 626) @@ -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 { Modified: trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties =================================================================== --- trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties 2008-05-14 20:52:11 UTC (rev 625) +++ trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties 2008-05-15 21:36:28 UTC (rev 626) @@ -1 +1,2 @@ jsse.alias_no_key_entry=Alias name {0} does not identify a key entry +jsse.keystore_load_failed=Failed to load keystore type {0} with path {1} due to {2} Modified: trunk/java/org/jboss/web/cluster/ClusterListener.java =================================================================== --- trunk/java/org/jboss/web/cluster/ClusterListener.java 2008-05-14 20:52:11 UTC (rev 625) +++ trunk/java/org/jboss/web/cluster/ClusterListener.java 2008-05-15 21:36:28 UTC (rev 626) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source - * Copyright 2006, JBoss Inc., and individual contributors as indicated + * Copyright 2008, JBoss Inc., and individual contributors as indicated * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-05-14 20:52:11 UTC (rev 625) +++ trunk/webapps/docs/changelog.xml 2008-05-15 21:36:28 UTC (rev 626) @@ -36,6 +36,9 @@ </subsection> <subsection name="Coyote"> <changelog> + <fix> + <bug>44968</bug>: Provide more information when keystore load fails. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper">