Merge branch '3.2.x'

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java

@@ -150,7 +150,8 @@ public class AnsiPropertySource extends PropertySource<AnsiElement> {
 				try {
 					return this.factory.apply(Integer.parseInt(postfix));
 				}
-				catch (IllegalArgumentException ignored) {
+				catch (IllegalArgumentException ex) {
+					// Ignore
 				}
 			}
 			return null;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBean.java

@@ -157,6 +157,7 @@ public final class ConfigurationPropertiesBean {
 					}
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandler.java

@@ -110,6 +110,7 @@ public class NoUnboundElementsBindHandler extends AbstractBindHandler {
 						source.filter((candidate) -> isUnbound(name, candidate)).getConfigurationProperty(unboundName));
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java

@@ -212,6 +212,7 @@ public class ValidationBindHandler extends AbstractBindHandler {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 			return null;
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesPropertyResolver.java

@@ -49,6 +49,7 @@ class ConfigurationPropertySourcesPropertyResolver extends AbstractPropertyResol
 					return attached.findConfigurationProperty(name) != null;
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}
@@ -91,6 +92,7 @@ class ConfigurationPropertySourcesPropertyResolver extends AbstractPropertyResol
 					return (configurationProperty != null) ? configurationProperty.getValue() : null;
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/DefaultPropertyMapper.java

@@ -75,6 +75,7 @@ final class DefaultPropertyMapper implements PropertyMapper {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return ConfigurationPropertyName.EMPTY;
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySource.java

@@ -89,6 +89,7 @@ class SpringConfigurationPropertySource implements ConfigurationPropertySource {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return null;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/TextResourceOrigin.java

@@ -121,6 +121,7 @@ public class TextResourceOrigin implements Origin {
 			}
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 		return resource.getDescription();
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/ApplicationHome.java

@@ -82,6 +82,7 @@ public class ApplicationHome {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -98,6 +99,7 @@ public class ApplicationHome {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return null;
 	}
@@ -112,6 +114,7 @@ public class ApplicationHome {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return false;
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServer.java

@@ -155,6 +155,7 @@ public class UndertowWebServer implements WebServer {
 			closeable.close();
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java

@@ -304,6 +304,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered {
 			collection.add(ClassUtils.forName(className, null));
 		}
 		catch (Throwable ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/metrics/buffering/BufferingApplicationStartupTests.java

@@ -139,6 +139,7 @@ class BufferingApplicationStartupTests {
 							Thread.sleep(1);
 						}
 						catch (InterruptedException ex) {
+							// Ignore
 						}
 						step.end();
 					}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindConverterTests.java

@@ -208,6 +208,7 @@ class BindConverterTests {
 				thread.join();
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 		}
 		assertThat(results).isNotEmpty().doesNotContainNull();

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/security/servlet/ApplicationContextRequestMatcherTests.java

@@ -133,6 +133,7 @@ class ApplicationContextRequestMatcherTests {
 			thread.join(1000);
 		}
 		catch (InterruptedException ex) {
+			// Ignore
 		}
 	}
 
@@ -205,6 +206,7 @@ class ApplicationContextRequestMatcherTests {
 				Thread.sleep(200);
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 			this.initialized.set(true);
 		}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

@@ -1242,7 +1242,7 @@ public abstract class AbstractServletWebServerFactoryTests {
 			blockingServlet.admitOne();
 		}
 		catch (RuntimeException ex) {
-
+			// Ignore
 		}
 	}
 
@@ -1298,7 +1298,7 @@ public abstract class AbstractServletWebServerFactoryTests {
 			blockingServlet.admitOne();
 		}
 		catch (RuntimeException ex) {
-
+			// Ignore
 		}
 	}