svn commit: r1147949 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java java/org/apache/catalina/connector/LocalStrings.properties res/tomcat.nsi webapps/docs/changelog.xml

[ma...@apache.org]

Author: markt
Date: Mon Jul 18 16:18:54 2011
New Revision: 1147949

URL: http://svn.apache.org/viewvc?rev=1147949&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51503
Add additional validation to Windows installer and Tomcat start for connector port numbers

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Connector.java
    tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
    tomcat/trunk/res/tomcat.nsi
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1147949&r1=1147948&r2=1147949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Jul 18 16:18:54 2011
@@ -927,6 +927,12 @@ public class Connector extends Lifecycle
     @Override
     protected void startInternal() throws LifecycleException {
 
+        // Validate settings before starting
+        if (getPort() < 1) {
+            throw new LifecycleException(sm.getString(
+                    "coyoteConnector.invalidPort", Integer.valueOf(getPort())));
+        }
+
         setState(LifecycleState.STARTING);
 
         try {

Modified: tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1147949&r1=1147948&r2=1147949&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Mon Jul 18 16:18:54 2011
@@ -18,6 +18,7 @@
 # CoyoteConnector
 #
 coyoteConnector.cannotRegisterProtocol=Cannot register MBean for the Protocol
+coyoteConnector.invalidPort=The connector cannot start since the specified port value of [{0}] is invalid
 coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
 coyoteConnector.protocolHandlerInitializationFailed=Protocol handler initialization failed
 coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation failed

Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1147949&r1=1147948&r2=1147949&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Mon Jul 18 16:18:54 2011
@@ -549,6 +549,24 @@ Function pageConfigurationLeave
     ${NSD_GetText} $CtlTomcatAdminRoles $TomcatAdminRoles
   ${EndIf}
 
+  ${If} $TomcatPortShutdown == ""
+    MessageBox MB_ICONEXCLAMATION|MB_OK 'The shutdown port may not be empty'
+    Abort "Config not right"
+    Goto exit
+  ${EndIf}
+
+  ${If} $TomcatPortHttp == ""
+    MessageBox MB_ICONEXCLAMATION|MB_OK 'The HTTP port may not be empty'
+    Abort "Config not right"
+    Goto exit
+  ${EndIf}
+
+  ${If} $TomcatPortAjp == ""
+    MessageBox MB_ICONEXCLAMATION|MB_OK 'The AJP port may not be empty'
+    Abort "Config not right"
+    Goto exit
+  ${EndIf}
+
   ${If} $TomcatServiceName == ""
     MessageBox MB_ICONEXCLAMATION|MB_OK 'The Service Name may not be empty'
     Abort "Config not right"

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1147949&r1=1147948&r2=1147949&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 18 16:18:54 2011
@@ -70,6 +70,19 @@
         Correctly handle a connectionTimeout value of -1 (no timeout) for the
         HTTP NIO and AJP NIO connectors. (markt)
       </fix>
+      <fix>
+        <bug>51503</bug>: Add additional validation that prevents a connector
+        from starting if it does not have a port > 0. (markt)
+      </fix>
+    </changelog>
+  </subsection>
+  <subsection>
+    <changelog>
+      <fix>
+        <bug>51503</bug>: Add additional validation to Windows installer that
+        ensure that the shutdown port, HTTP port and AJP port are all specified
+        during the install process. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>



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