spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-25 16:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Ensure SpEL's InlineList is immutable in compiled mode

Browse Source 
Prior to this commit, SpEL's InlineList was cached as a mutable list in
compiled mode (i.e., in a static field in the generated byte code).

To address that, this commit modifies InlineList's generateClinitCode()
method so that it wraps both top-level and nested inline lists using
Collections.unmodifiableList(), analogous to what we already do in
createList().

Closes gh-37001
This commit is contained in:
Sam Brannen
2026-07-06 10:52:54 +02:00
parent d1470bbb25
commit f0e69a702c
2 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
+49
View File
@@ -1619,6 +1619,55 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
o = expression.getValue();
assertThat(o).isEqualTo("op");
}
@Test // gh-37001
@SuppressWarnings("unchecked")
void compiledInlineListIsUnmodifiable() {
expression = parser.parseExpression("{1, 2, 3}");
List<Object> interpreted = (List<Object>) expression.getValue();
assertThat(interpreted).containsExactly(1, 2, 3);
// Interpreted --> unmodifiable
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> interpreted.add("boom"));
assertCanCompile(expression);
List<Object> compiled = (List<Object>) expression.getValue();
assertThat(compiled).containsExactly(1, 2, 3);
// Compiled --> unmodifiable
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> compiled.add("boom"));
// Same list reference must be returned on every evaluation
assertThat(expression.getValue()).isSameAs(compiled);
}
@Test // gh-37001
@SuppressWarnings("unchecked")
void compiledNestedInlineListsAreUnmodifiable() {
expression = parser.parseExpression("{{1, 2}, {3, 4}}");
List<Object> interpreted = (List<Object>) expression.getValue();
assertThat(interpreted.toString()).isEqualTo("[[1, 2], [3, 4]]");
// Interpreted --> unmodifiable
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> interpreted.add("boom"));
List<Object> nested1Interpreted = (List<Object>) interpreted.get(0);
List<Object> nested2Interpreted = (List<Object>) interpreted.get(1);
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> nested1Interpreted.add("boom"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> nested2Interpreted.add("boom"));
assertCanCompile(expression);
List<Object> compiled = (List<Object>) expression.getValue();
assertThat(compiled.toString()).isEqualTo("[[1, 2], [3, 4]]");
// Compiled --> unmodifiable
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> compiled.add("boom"));
List<Object> nested1Compiled = (List<Object>) compiled.get(0);
List<Object> nested2Compiled = (List<Object>) compiled.get(1);
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> nested1Compiled.add("boom"));
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(() -> nested2Compiled.add("boom"));
}
}
@Nested