Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix DataSourceUtils inconsistent exception handling

Browse Source 
Align IllegalStateException with SQLException handling and propagate
the original exception.

See gh-28669

Co-authored-by: Christoph Mies <chr.mi@web.de>
This commit is contained in:
Kevin Schönfeld
2022-06-22 20:44:04 +02:00
committed by Stephane Nicoll
parent 26df4580b3
commit edfe5d2f18
3 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
View File

@@ -48,4 +48,7 @@ public class CannotGetJdbcConnectionException extends DataAccessResourceFailureE
super(msg, ex);
}
public CannotGetJdbcConnectionException(String msg, IllegalStateException ex) {
super(msg, ex);
}
}

4
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -83,7 +83,7 @@ public abstract class DataSourceUtils {
throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex);
}
catch (IllegalStateException ex) {
throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection: " + ex.getMessage());
throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex);
}
}