Author: fschumacher
Date: Fri Aug 10 10:00:18 2018
New Revision: 1837786
URL: http://svn.apache.org/viewvc?rev=1837786&view=rev
Log:
Use short circuit logic to prevent potential NPE in CorsFilter.
The same logic is used a few lines below, so it was most probably
intended that way anyways.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1837786&r1=1837785&r2=1837786&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Fri Aug 10
10:00:18 2018
@@ -453,7 +453,7 @@ public class CorsFilter extends GenericF
String.valueOf(preflightMaxAge));
}
- if ((allowedHttpMethods != null & !allowedHttpMethods.isEmpty()))
{
+ if ((allowedHttpMethods != null) &&
(!allowedHttpMethods.isEmpty())) {
response.addHeader(
CorsFilter.RESPONSE_HEADER_ACCESS_CONTROL_ALLOW_METHODS,
join(allowedHttpMethods, ","));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837786&r1=1837785&r2=1837786&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 10:00:18 2018
@@ -103,6 +103,9 @@
<bug>62607</bug>: Return a non-zero exit code from
<code>catalina.[bat|sh] run</code> if Tomcat fails to start. (markt)
</add>
+ <fix>
+ Use short circuit logic to prevent potential NPE in CorsFilter.
(fschumacher)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
