diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java index 68caea40f0..4fa298eb5a 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java @@ -92,8 +92,8 @@ public class InlineList extends SpelNodeImpl { return this.constant; } else { - List returnValue = new ArrayList<>(); int childCount = getChildCount(); + List returnValue = new ArrayList<>(childCount); for (int c = 0; c < childCount; c++) { returnValue.add(getChild(c).getValue(expressionState)); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java index 9ad6cc1111..21493b4692 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java @@ -56,8 +56,7 @@ public class AnnotationExceptionHandlerMethodResolver extends AbstractExceptionH Map, Method> result = new HashMap<>(); for (Map.Entry entry : methods.entrySet()) { Method method = entry.getKey(); - List> exceptionTypes = new ArrayList<>(); - exceptionTypes.addAll(Arrays.asList(entry.getValue().value())); + List> exceptionTypes = new ArrayList<>(Arrays.asList(entry.getValue().value())); if (exceptionTypes.isEmpty()) { exceptionTypes.addAll(getExceptionsFromMethodSignature(method)); }