Author: markt
Date: Fri Apr 4 21:42:51 2014
New Revision: 1584925
URL: http://svn.apache.org/r1584925
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56327
Enable AJP as well as HTTP connectors to be created via JMX. Patch by kiran.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java?rev=1584925&r1=1584924&r2=1584925&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java Fri Apr 4
21:42:51 2014
@@ -59,14 +59,12 @@ public class ServiceMBean extends BaseMo
} catch (InvalidTargetObjectTypeException e) {
throw new MBeanException(e);
}
-
- Connector connector = new Connector();
+ String protocol = isAjp ? "AJP/1.3" : "HTTP/1.1";
+ Connector connector = new Connector(protocol);
if ((address!=null) && (address.length()>0)) {
connector.setProperty("address", address);
}
-
connector.setPort(port);
- connector.setProtocol(isAjp ? "AJP/1.3" : "HTTP/1.1");
connector.setSecure(isSSL);
connector.setScheme(isSSL ? "https" : "http");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1584925&r1=1584924&r2=1584925&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 4 21:42:51 2014
@@ -71,6 +71,10 @@
during undeploy will fail. (markt)
</fix>
<fix>
+ <bug>56327</bug>: Enable AJP as well as HTTP connectors to be created
+ via JMX. Patch by kiran. (markt)
+ </fix>
+ <fix>
<bug>56339</bug>: Avoid an infinite loop if an application calls
<code>session.invalidate()</code> from the session destroyed event for
that session. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
