Author: remm
Date: Mon Nov 14 14:16:34 2016
New Revision: 1769636
URL: http://svn.apache.org/viewvc?rev=1769636&view=rev
Log:
Follow up: in Tomcat 9, don't automatically create a default connector.
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=1769636&r1=1769635&r2=1769636&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Nov 14
14:16:34 2016
@@ -138,7 +138,6 @@ public class Tomcat {
protected int port = 8080;
protected String hostname = "localhost";
protected String basedir;
- protected boolean defaultConnectorCreated = false;
private final Map<String, String> userPass = new HashMap<>();
private final Map<String, List<String>> userRoles = new HashMap<>();
@@ -327,7 +326,6 @@ public class Tomcat {
*/
public void init() throws LifecycleException {
getServer();
- getConnector();
server.init();
}
@@ -339,7 +337,6 @@ public class Tomcat {
*/
public void start() throws LifecycleException {
getServer();
- getConnector();
server.start();
}
@@ -395,32 +392,18 @@ public class Tomcat {
// You can tune individual tomcat objects, using internal APIs
/**
- * Get the default http connector. You can set more
- * parameters - the port is already initialized.
+ * Get the default http connector that is used by the embedded
+ * Tomcat. It is first configured connector in the service.
+ * This will not create a default connector.
*
- * Alternatively, you can construct a Connector and set any params,
- * then call addConnector(Connector)
- *
- * @return A connector object that can be customized
+ * @return The connector object
*/
public Connector getConnector() {
Service service = getService();
if (service.findConnectors().length > 0) {
return service.findConnectors()[0];
}
-
- if (defaultConnectorCreated) {
- 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);
- defaultConnectorCreated = true;
- return connector;
+ return null;
}
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=1769636&r1=1769635&r2=1769636&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 14 14:16:34 2016
@@ -65,10 +65,10 @@
Correctly handle the <code>configClass</code> attribute of a Host when
embedding Tomcat. (markt)
</fix>
- <fix>
- <bug>60368</bug>: Restore egde casefor embedded allowing the connector
- to be removed. (remm)
- </fix>
+ <update>
+ <bug>60368</bug>: Stop creating a default connector in embedded mode.
+ (remm)
+ </update>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
