Author: markt
Date: Fri Oct 7 10:28:18 2016
New Revision: 1763731
URL: http://svn.apache.org/viewvc?rev=1763731&view=rev
Log:
Reduce multiple error messages when Connector fails to instantiate the
associated ProtocolHandler.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
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=1763731&r1=1763730&r2=1763731&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Oct 7
10:28:18 2016
@@ -280,6 +280,9 @@ public class Connector extends Lifecycle
* @return the property value
*/
public Object getProperty(String name) {
+ if (protocolHandler == null) {
+ return null;
+ }
String repl = name;
if (replacements.get(name) != null) {
repl = replacements.get(name);
@@ -296,6 +299,9 @@ public class Connector extends Lifecycle
* @return <code>true</code> if the property was successfully set
*/
public boolean setProperty(String name, String value) {
+ if (protocolHandler == null) {
+ return false;
+ }
String repl = name;
if (replacements.get(name) != null) {
repl = replacements.get(name);
@@ -870,7 +876,9 @@ public class Connector extends Lifecycle
*/
public void pause() {
try {
- protocolHandler.pause();
+ if (protocolHandler != null) {
+ protocolHandler.pause();
+ }
} catch (Exception e) {
log.error(sm.getString
("coyoteConnector.protocolHandlerPauseFailed"), e);
@@ -883,7 +891,9 @@ public class Connector extends Lifecycle
*/
public void resume() {
try {
- protocolHandler.resume();
+ if (protocolHandler != null) {
+ protocolHandler.resume();
+ }
} catch (Exception e) {
log.error(sm.getString
("coyoteConnector.protocolHandlerResumeFailed"), e);
@@ -896,6 +906,11 @@ public class Connector extends Lifecycle
super.initInternal();
+ if (protocolHandler == null) {
+ throw new LifecycleException(
+
sm.getString("coyoteConnector.protocolHandlerInstantiationFailed"));
+ }
+
// Initialize adapter
adapter = new CoyoteAdapter(this);
protocolHandler.setAdapter(adapter);
@@ -973,7 +988,9 @@ public class Connector extends Lifecycle
setState(LifecycleState.STOPPING);
try {
- protocolHandler.stop();
+ if (protocolHandler != null) {
+ protocolHandler.stop();
+ }
} catch (Exception e) {
throw new LifecycleException
(sm.getString
@@ -985,7 +1002,9 @@ public class Connector extends Lifecycle
@Override
protected void destroyInternal() throws LifecycleException {
try {
- protocolHandler.destroy();
+ if (protocolHandler != null) {
+ protocolHandler.destroy();
+ }
} catch (Exception e) {
throw new LifecycleException
(sm.getString
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1763731&r1=1763730&r2=1763731&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Fri Oct 7
10:28:18 2016
@@ -331,8 +331,8 @@ public class Catalina {
digester.addRule("Server/Service/Connector",
new ConnectorCreateRule());
- digester.addRule("Server/Service/Connector",
- new SetAllPropertiesRule(new String[]{"executor",
"sslImplementationName"}));
+ digester.addRule("Server/Service/Connector", new SetAllPropertiesRule(
+ new String[]{"executor", "sslImplementationName",
"protocol"}));
digester.addSetNext("Server/Service/Connector",
"addConnector",
"org.apache.catalina.connector.Connector");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763731&r1=1763730&r2=1763731&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct 7 10:28:18 2016
@@ -51,6 +51,10 @@
When creating a new Connector via JMX, ensure that both HTTP/1.1 and
AJP/1.3 connectors can be created. (markt)
</fix>
+ <fix>
+ Reduce multiple error messages when Connector fails to instantiate the
+ associated ProtocolHandler. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
