Author: markt
Date: Tue May 22 19:32:37 2018
New Revision: 1832060
URL: http://svn.apache.org/viewvc?rev=1832060&view=rev
Log:
SpotBugs: Fix a couple of minor issues
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
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=1832060&r1=1832059&r2=1832060&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Tue May 22
19:32:37 2018
@@ -21,6 +21,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -154,8 +155,6 @@ public class CorsFilter extends GenericF
switch (requestType) {
case SIMPLE:
// Handles a Simple CORS request.
- this.handleSimpleCORS(request, response, filterChain);
- break;
case ACTUAL:
// Handles an Actual CORS request.
this.handleSimpleCORS(request, response, filterChain);
@@ -494,15 +493,6 @@ public class CorsFilter extends GenericF
switch (corsRequestType) {
case SIMPLE:
- request.setAttribute(
- CorsFilter.HTTP_REQUEST_ATTRIBUTE_IS_CORS_REQUEST,
- Boolean.TRUE);
- request.setAttribute(CorsFilter.HTTP_REQUEST_ATTRIBUTE_ORIGIN,
- request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN));
- request.setAttribute(
- CorsFilter.HTTP_REQUEST_ATTRIBUTE_REQUEST_TYPE,
- corsRequestType.name().toLowerCase(Locale.ENGLISH));
- break;
case ACTUAL:
request.setAttribute(
CorsFilter.HTTP_REQUEST_ATTRIBUTE_IS_CORS_REQUEST,
@@ -1067,8 +1057,8 @@ public class CorsFilter extends GenericF
* >http://www.w3.org/TR/cors/#terminology</a>
*/
public static final Collection<String>
SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES =
- new HashSet<>(Arrays.asList("application/x-www-form-urlencoded",
- "multipart/form-data", "text/plain"));
+ Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+ "application/x-www-form-urlencoded",
"multipart/form-data", "text/plain")));
// ------------------------------------------------ Configuration Defaults
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
