This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new ea50c07 Fix testsuite NPEs
ea50c07 is described below
commit ea50c079b5503f7363ab08c18163f540f69c70a1
Author: remm <[email protected]>
AuthorDate: Mon Feb 1 15:18:13 2021 +0100
Fix testsuite NPEs
---
java/org/apache/catalina/connector/Connector.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 8eb235d..c0305a9 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -950,7 +950,7 @@ public class Connector extends LifecycleMBeanBase {
StringBuilder sb = new StringBuilder("type=");
sb.append(type);
- String id = protocolHandler.getId();
+ String id = (protocolHandler != null) ? protocolHandler.getId() : null;
if (id != null) {
// Maintain MBean name compatibility, even if not accurate
sb.append(",port=0,address=");
@@ -1066,7 +1066,8 @@ public class Connector extends LifecycleMBeanBase {
protected void startInternal() throws LifecycleException {
// Validate settings before starting
- if (protocolHandler.getId() == null && getPortWithOffset() < 0) {
+ String id = (protocolHandler != null) ? protocolHandler.getId() : null;
+ if (id == null && getPortWithOffset() < 0) {
throw new LifecycleException(sm.getString(
"coyoteConnector.invalidPort",
Integer.valueOf(getPortWithOffset())));
}
@@ -1132,9 +1133,9 @@ public class Connector extends LifecycleMBeanBase {
StringBuilder sb = new StringBuilder("Connector[");
sb.append(getProtocol());
sb.append('-');
- Object id = protocolHandler.getId();
+ String id = (protocolHandler != null) ? protocolHandler.getId() : null;
if (id != null) {
- sb.append(id.toString());
+ sb.append(id);
} else {
int port = getPortWithOffset();
if (port > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
