From 7ef8cc9fafdbc115a5b2bd1b5e111d791be0e2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Tue, 28 May 2019 17:08:58 +0300 Subject: [PATCH] Tiny improvements regarding ArrayList creation Closes gh-23047 --- .../org/springframework/expression/spel/ast/InlineList.java | 2 +- .../support/AnnotationExceptionHandlerMethodResolver.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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)); }