Merge pull request #22421 from olszewskimichal/LinkedMultiValueMap-OutOfBoundException-When-EmptyList

jhoeller · web-flow · commit 7e5aacf8a26b · 2019-05-07T12:44:05.000+02:00
LinkedMultiValueMap.getFirst - check that values is not empty
diff --git a/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java b/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
@@ -81,7 +81,7 @@ public LinkedMultiValueMap(Map<K, List<V>> otherMap) {
 	@Nullable
 	public V getFirst(K key) {
 		List<V> values = this.targetMap.get(key);
-		return (values != null ? values.get(0) : null);
+		return (values != null && !values.isEmpty() ? values.get(0) : null);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public LinkedMultiValueMap(Map<K, List<V>> otherMap) {`
`81`	`81`	`@Nullable`
`82`	`82`	`public V getFirst(K key) {`
`83`	`83`	`List<V> values = this.targetMap.get(key);`
`84`		`- return (values != null ? values.get(0) : null);`
	`84`	`+ return (values != null && !values.isEmpty() ? values.get(0) : null);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`@Override`