Author: remy.maucherat(a)jboss.com Date: 2008-01-28 10:10:27 -0500 (Mon, 28 Jan 2008) New Revision: 410 Modified: trunk/java/org/apache/catalina/core/LocalStrings.properties trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java trunk/webapps/docs/changelog.xml Log: - Minor fixes. Modified: trunk/java/org/apache/catalina/core/LocalStrings.properties =================================================================== --- trunk/java/org/apache/catalina/core/LocalStrings.properties 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/java/org/apache/catalina/core/LocalStrings.properties 2008-01-28 15:10:27 UTC (rev 410) @@ -54,6 +54,7 @@ standardContext.applicationSkipped=Skipped installing application listeners due to previous error(s) standardContext.badRequest=Invalid request path ({0}). standardContext.crlfinurl=The URL pattern "{0}" contains a CR or LF and so can never be matched. +standardContext.duplicateListener=The listener "{0}" is already configured for this context. The duplicate definition has been ignored. standardContext.errorPage.error=Error page location {0} must start with a ''/'' standardContext.errorPage.required=ErrorPage cannot be null standardContext.errorPage.warning=WARNING: Error page location {0} must start with a ''/'' in Servlet 2.4 Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2008-01-28 15:10:27 UTC (rev 410) @@ -1996,8 +1996,10 @@ synchronized (applicationListeners) { String results[] =new String[applicationListeners.length + 1]; for (int i = 0; i < applicationListeners.length; i++) { - if (listener.equals(applicationListeners[i])) + if (listener.equals(applicationListeners[i])) { + log.info(sm.getString("standardContext.duplicateListener", listener)); return; + } results[i] = applicationListeners[i]; } results[applicationListeners.length] = listener; Modified: trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2008-01-28 15:10:27 UTC (rev 410) @@ -283,6 +283,9 @@ log.debug("TrustPass = " + trustStorePassword); } String truststoreType = (String)attributes.get("truststoreType"); + if( truststoreType == null) { + truststoreType = System.getProperty("javax.net.ssl.trustStoreType"); + } if(truststoreType == null) { truststoreType = keystoreType; } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-01-28 10:40:31 UTC (rev 409) +++ trunk/webapps/docs/changelog.xml 2008-01-28 15:10:27 UTC (rev 410) @@ -143,6 +143,9 @@ <fix> Set correct StandardManager.sessionCounter after reload/restart. (pero) </fix> + <fix> + <bug>44268</bug>: Log a warning when a duplicate listener is ignored. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> @@ -167,6 +170,9 @@ <fix> <bug>43868</bug>: MBean methods getInvoke() and getSetter() were broken. (markt) </fix> + <fix> + <bug>44223</bug>: Add support for remaining truststore system property. (markt) + </fix> </changelog> </subsection> <subsection name="Jasper">