From 2c2c7cee8d63b98d3c59d27d33a9f5944c411412 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 6 Oct 2015 09:54:13 +0100 Subject: [PATCH] Polish contribution See gh-4082 --- .../autoconfigure/jdbc/DataSourceProperties.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 1030a051c37..74745670432 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -39,6 +39,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Maciej Walkowiak * @author Stephane Nicoll + * @author Benedikt Ritter * @since 1.1.0 */ @ConfigurationProperties(prefix = DataSourceProperties.PREFIX) @@ -161,8 +162,8 @@ public class DataSourceProperties implements BeanClassLoaderAware, EnvironmentAw public String getDriverClassName() { if (StringUtils.hasText(this.driverClassName)) { - Assert.state(driverClassIsLoadable(), - "Cannot load driver class: " + this.driverClassName); + Assert.state(driverClassIsLoadable(), "Cannot load driver class: " + + this.driverClassName); return this.driverClassName; } String driverClassName = null; @@ -187,11 +188,11 @@ public class DataSourceProperties implements BeanClassLoaderAware, EnvironmentAw ClassUtils.forName(this.driverClassName, null); return true; } - catch (UnsupportedClassVersionError ucve) { - // driver library has been compiled with a later JDK, propagate error - throw ucve; + catch (UnsupportedClassVersionError ex) { + // Driver library has been compiled with a later JDK, propagate error + throw ex; } - catch (Throwable t) { + catch (Throwable ex) { return false; } }