Author: markt
Date: Thu Jan 23 21:25:27 2014
New Revision: 1560812
URL: http://svn.apache.org/r1560812
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56039
Enable JmxRemoteLifecycleListener to work with SSL.
Patch by esengstrom.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1560810
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1560812&r1=1560811&r2=1560812&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
Thu Jan 23 21:25:27 2014
@@ -240,6 +240,7 @@ public class JmxRemoteLifecycleListener
if (csf != null) {
env.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE,
csf);
+ env.put("com.sun.jndi.rmi.factory.socket", csf);
}
if (ssf != null) {
env.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE,
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1560812&r1=1560811&r2=1560812&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 23 21:25:27 2014
@@ -200,6 +200,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Extras">
+ <changelog>
+ <fix>
+ <bug>56039</bug>: Enable the JmxRemoteLifecycleListener to work over
+ SSL. Patch by esengstrom. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
