Merge branch '5.1.x'

2019-05-03 18:13:12 +02:00
parent 83046531da ea4a174583
commit f0f6af2926
20 changed files with 73 additions and 68 deletions
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
@@ -576,7 +576,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 			}

 			private String appendSql(@Nullable String sql, String statement) {
-				return (StringUtils.isEmpty(sql) ? statement : sql + "; " + statement);
+				return (StringUtils.hasLength(sql) ? sql + "; " + statement : statement);
 			}

 			@Override