Author: remm
Date: Mon Nov 14 13:54:32 2016
New Revision: 1769630
URL: http://svn.apache.org/viewvc?rev=1769630&view=rev
Log:
60368: Restore the behavior of the default connector creation when embedded.
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=1769630&r1=1769629&r2=1769630&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Nov 14
13:54:32 2016
@@ -138,6 +138,7 @@ 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<>();
@@ -408,6 +409,9 @@ public class Tomcat {
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.
@@ -415,6 +419,7 @@ public class Tomcat {
Connector connector = new Connector("HTTP/1.1");
connector.setPort(port);
service.addConnector(connector);
+ defaultConnectorCreated = true;
return connector;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1769630&r1=1769629&r2=1769630&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 14 13:54:32 2016
@@ -65,6 +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>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
