svn commit: r1769663 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java

[remm]

Author: remm
Date: Mon Nov 14 17:03:25 2016
New Revision: 1769663

URL: http://svn.apache.org/viewvc?rev=1769663&view=rev
Log:
Revert 1769657, but set the defaultConnectorCreated in setConnector.

Modified:
    tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1769663&r1=1769662&r2=1769663&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Nov 
14 17:03:25 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<>();
@@ -326,6 +327,7 @@ public class Tomcat {
      */
     public void init() throws LifecycleException {
         getServer();
+        getConnector();
         server.init();
     }
 
@@ -337,6 +339,7 @@ public class Tomcat {
      */
     public void start() throws LifecycleException {
         getServer();
+        getConnector();
         server.start();
     }
 
@@ -406,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.
@@ -413,6 +419,7 @@ public class Tomcat {
         Connector connector = new Connector("HTTP/1.1");
         connector.setPort(port);
         service.addConnector(connector);
+        defaultConnectorCreated = true;
         return connector;
     }
 
@@ -425,6 +432,7 @@ public class Tomcat {
             }
         }
         if (!found) {
+            defaultConnectorCreated = true;
             service.addConnector(connector);
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org