Skip to content

Commit 7f29f0e

Browse files
committed
Revert commit 3505c4b
The fix did not address the issue. It only made the constructor not fail with tests succeeding due to setter binding instead. See gh-34043
1 parent 3898482 commit 7f29f0e

File tree

2 files changed

+2
-140
lines changed

2 files changed

+2
-140
lines changed

Diff for: spring-context/src/main/java/org/springframework/validation/DataBinder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ private <V> Map<String, V> createMap(
10821082
}
10831083
int startIdx = paramPath.length() + 1;
10841084
int endIdx = name.indexOf(']', startIdx);
1085-
String nestedPath = ((name.length() > endIdx + 1) ? name.substring(0, endIdx + 2) : "");
1085+
String nestedPath = name.substring(0, endIdx + 2);
10861086
boolean quoted = (endIdx - startIdx > 2 && name.charAt(startIdx) == '\'' && name.charAt(endIdx - 1) == '\'');
10871087
String key = (quoted ? name.substring(startIdx + 1, endIdx - 1) : name.substring(startIdx, endIdx));
10881088
if (map == null) {
@@ -1116,7 +1116,7 @@ private static SortedSet<Integer> getIndexes(String paramPath, ValueResolver val
11161116
SortedSet<Integer> indexes = null;
11171117
for (String name : valueResolver.getNames()) {
11181118
if (name.startsWith(paramPath + "[")) {
1119-
int endIndex = name.indexOf(']', paramPath.length() + 1);
1119+
int endIndex = name.indexOf(']', paramPath.length() + 2);
11201120
String rawIndex = name.substring(paramPath.length() + 1, endIndex);
11211121
int index = Integer.parseInt(rawIndex);
11221122
indexes = (indexes != null ? indexes : new TreeSet<>());

Diff for: spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/ServletRequestDataBinderIntegrationTests.java

-138
This file was deleted.

0 commit comments

Comments
 (0)