From 15c19411f68228fd450c5da2fb65a958e5eabe98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <snicoll@vmware.com>
Date: Thu, 12 Oct 2023 13:55:33 +0200
Subject: [PATCH] Harmonize exception handling

This commit applies the same catch block to orderForConsistence(Map)
than the one that's used for sets.

Closes gh-31419
---
 ...nDefinitionPropertyValueCodeGenerator.java | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGenerator.java
index c05a966b0b3..3d624b076ad 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGenerator.java
@@ -449,17 +449,17 @@ class BeanDefinitionPropertyValueCodeGenerator {
 				return CodeBlock.of("new $T($L)", LinkedHashSet.class,
 						generateCollectionOf(set, List.class, elementType));
 			}
-			try {
-				set = orderForCodeConsistency(set);
-			}
-			catch (ClassCastException ex) {
-				// If elements are not comparable, just keep the original set
-			}
-			return super.generateCollectionCode(elementType, set);
+			return super.generateCollectionCode(elementType, orderForCodeConsistency(set));
 		}
 
 		private Set<?> orderForCodeConsistency(Set<?> set) {
-			return new TreeSet<Object>(set);
+			try {
+				return new TreeSet<Object>(set);
+			}
+			catch (ClassCastException ex) {
+				// If elements are not comparable, just keep the original set
+				return set;
+			}
 		}
 	}
 
@@ -515,7 +515,13 @@ class BeanDefinitionPropertyValueCodeGenerator {
 		}
 
 		private <K, V> Map<K, V> orderForCodeConsistency(Map<K, V> map) {
-			return new TreeMap<>(map);
+			try {
+				return new TreeMap<>(map);
+			}
+			catch (ClassCastException ex) {
+				// If elements are not comparable, just keep the original map
+				return map;
+			}
 		}
 
 		private <K, V> CodeBlock generateLinkedHashMapCode(Map<K, V> map,