Author: remm
Date: Mon Nov 14 17:11:30 2016
New Revision: 1769665
URL: http://svn.apache.org/viewvc?rev=1769665&view=rev
Log:
Restore the default connector creation, the most important part is to not
create it on start. The only broken use is an app which doesn't call
getConnector (and needs only port configuration).
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1769665&r1=1769664&r2=1769665&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Nov 14
17:11:30 2016
@@ -166,8 +166,8 @@ public class Tomcat {
}
/**
- * Set the port for the default connector. Must
- * be called before start().
+ * Set the port for the default connector. The default connector will
+ * only be created if getConnector is called.
* @param port The port number
*/
public void setPort(int port) {
@@ -403,7 +403,14 @@ public class Tomcat {
if (service.findConnectors().length > 0) {
return service.findConnectors()[0];
}
- return null;
+ // The same as in standard Tomcat configuration.
+ // This creates an APR HTTP connector if AprLifecycleListener has been
+ // configured (created) and Tomcat Native library is available.
+ // Otherwise it creates a NIO HTTP connector.
+ Connector connector = new Connector("HTTP/1.1");
+ connector.setPort(port);
+ service.addConnector(connector);
+ return connector;
}
public void setConnector(Connector connector) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1769665&r1=1769664&r2=1769665&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 14 17:11:30 2016
@@ -66,8 +66,8 @@
embedding Tomcat. (markt)
</fix>
<update>
- <bug>60368</bug>: Stop creating a default connector in embedded mode.
- (remm)
+ <bug>60368</bug>: Stop creating a default connector on start in
+ embedded mode. (remm)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
