Skip to content

Commit bcf235c

Browse files
committed
Merge branch '6.1.x'
2 parents 7ad197e + 26ca7c4 commit bcf235c

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
2525
import java.util.Map;
2626
import java.util.Set;
2727
import java.util.Spliterator;
28-
import java.util.Spliterators;
2928
import java.util.stream.Stream;
3029

3130
import org.springframework.lang.Nullable;
@@ -255,7 +254,7 @@ public Iterator<PropertyValue> iterator() {
255254

256255
@Override
257256
public Spliterator<PropertyValue> spliterator() {
258-
return Spliterators.spliterator(this.propertyValueList, 0);
257+
return this.propertyValueList.spliterator();
259258
}
260259

261260
@Override

spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
1919
import java.util.Iterator;
2020
import java.util.List;
2121
import java.util.Spliterator;
22-
import java.util.Spliterators;
2322
import java.util.concurrent.CopyOnWriteArrayList;
2423
import java.util.stream.Stream;
2524

@@ -69,7 +68,7 @@ public Iterator<PropertySource<?>> iterator() {
6968

7069
@Override
7170
public Spliterator<PropertySource<?>> spliterator() {
72-
return Spliterators.spliterator(this.propertySourceList, 0);
71+
return this.propertySourceList.spliterator();
7372
}
7473

7574
@Override

0 commit comments

Comments
 (0)