Author: markt
Date: Wed Jun 6 14:43:38 2018
New Revision: 1833029
URL: http://svn.apache.org/viewvc?rev=1833029&view=rev
Log:
Avoid unlikely NPE
Identified by SpotBugs
Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1833029&r1=1833028&r2=1833029&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Wed Jun 6
14:43:38 2018
@@ -1545,7 +1545,7 @@ public final class Mapper {
* wild card host names from the external to internal form.
*/
private static String renameWildcardHost(String hostName) {
- if (hostName.startsWith("*.")) {
+ if (hostName != null && hostName.startsWith("*.")) {
return hostName.substring(1);
} else {
return hostName;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
