Skip to content

Commit

Permalink
Correctly set auto-growing array's element
Browse files Browse the repository at this point in the history
Prior to this commit, the implementation of processKeyedProperty() in
AbstractNestablePropertyAccessor resulted in a
`java.lang.IllegalArgumentException: array element type mismatch` when
the property expression had more than one property key and the last key
should cause the array to grow automatically.

For example, given a property `int[][] multiArray` and property
expression `multiArray[1][3]`, the `processKeyedProperty()` method
created a new array object and assigned it to `multiArray`; whereas,
the new array object should have be assigned to `multiArray[1]`.

This commit fixes this issue.

Closes spring-projectsgh-26600
  • Loading branch information
nullzl authored and sbrannen committed Feb 25, 2021
1 parent 2ec7d5c commit 4530e36
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,10 @@ private void processKeyedProperty(PropertyTokenHolder tokens, PropertyValue pv)
Class<?> componentType = propValue.getClass().getComponentType();
Object newArray = Array.newInstance(componentType, arrayIndex + 1);
System.arraycopy(propValue, 0, newArray, 0, length);
setPropertyValue(tokens.actualName, newArray);
propValue = getPropertyValue(tokens.actualName);
int lastKeyIndex = tokens.canonicalName.lastIndexOf('[');
String propName = tokens.canonicalName.substring(0, lastKeyIndex);
setPropertyValue(propName, newArray);
propValue = getPropertyValue(propName);
}
Array.set(propValue, arrayIndex, convertedValue);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ public void getPropertyValueAutoGrowMultiDimensionalArray() {
assertThat(bean.getMultiArray()[0][0]).isInstanceOf(Bean.class);
}

@Test
public void setPropertyValueAutoGrowMultiDimensionalArray() {
wrapper.setPropertyValue("multiArray[2][3]", new Bean());
assertThat(bean.getMultiArray()[2][3]).isInstanceOf(Bean.class);
}

@Test
public void getPropertyValueAutoGrowList() {
assertNotNull(wrapper.getPropertyValue("list[0]"));
Expand Down

0 comments on commit 4530e36

Please sign in to comment.