From 7f67cecd1045890fac8a9b8db2c815e9e2fc45bf Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 18 Jun 2019 16:10:30 +0900 Subject: [PATCH] Polish MappingMediaTypeFileExtensionResolver.addFileExtension() Closes gh-23145 --- .../web/accept/MappingMediaTypeFileExtensionResolver.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java b/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java index 806c4b0320c..41bdbbf3c0d 100644 --- a/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java +++ b/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java @@ -85,9 +85,8 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten } private void addFileExtension(MediaType mediaType, String extension) { - List newList = new CopyOnWriteArrayList<>(); - List oldList = this.fileExtensions.putIfAbsent(mediaType, newList); - (oldList != null ? oldList : newList).add(extension); + List list = this.fileExtensions.computeIfAbsent(mediaType, key -> new CopyOnWriteArrayList<>()); + list.add(extension); }