Handle correctly * in CorsConfiguration#combine() other parameter

Issue: SPR-13674
2015-11-12 10:40:32 +01:00
parent e8a0ef0206
commit 71e2d8e9de
2 changed files with 11 additions and 7 deletions
--- a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
+++ b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
@@ -17,7 +17,6 @@
 package org.springframework.web.cors;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

@@ -103,7 +102,7 @@ public class CorsConfiguration {
 	}

 	private List<String> combine(List<String> source, List<String> other) {
-		if (other == null) {
+		if (other == null || other.contains(ALL)) {
 			return source;
 		}
 		if (source == null || source.contains(ALL)) {