Merge branch '2.2.x'

spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java

@@ -179,14 +179,15 @@ public class RouteDefinitionRouteLocator implements RouteLocator {
 		// TODO: support option to apply defaults after route specific filters?
 		if (!this.gatewayProperties.getDefaultFilters().isEmpty()) {
 			filters.addAll(loadGatewayFilters(DEFAULT_FILTERS,
-					this.gatewayProperties.getDefaultFilters()));
+					new ArrayList<>(this.gatewayProperties.getDefaultFilters())));
 		}
 
 		if (!routeDefinition.getFilters().isEmpty()) {
 			filters.addAll(loadGatewayFilters(routeDefinition.getId(),
-					routeDefinition.getFilters()));
+					new ArrayList<>(routeDefinition.getFilters())));
 		}
 
+		Flux.just().onErrorContinue()
 		AnnotationAwareOrderComparator.sort(filters);
 		return filters;
 	}