Skip to content

Commit c3aed75

Browse files
committed
Merge branch '5.3.x'
# Conflicts: # build.gradle
2 parents 0a1ce75 + 46363c3 commit c3aed75

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

spring-core/spring-core.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ jar {
8585
dependsOn cglibRepackJar
8686
from(zipTree(cglibRepackJar.archivePath)) {
8787
include "org/springframework/cglib/**"
88-
exclude "org/springframework/cglib/beans/BeanMap*.class"
88+
exclude "org/springframework/cglib/beans/BeanMap.class"
89+
exclude "org/springframework/cglib/beans/BeanMap\$*.class"
8990
exclude "org/springframework/cglib/core/AbstractClassGenerator*.class"
9091
exclude "org/springframework/cglib/core/AsmApi*.class"
9192
exclude "org/springframework/cglib/core/KeyFactory.class"

spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,6 @@ public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
341341
"Unable to map column '" + column + "' to property '" + pd.getName() + "'", ex);
342342
}
343343
}
344-
else {
345-
// No PropertyDescriptor found
346-
if (rowNumber == 0 && logger.isDebugEnabled()) {
347-
logger.debug("No property found for column '" + column + "' mapped to field '" + field + "'");
348-
}
349-
}
350344
}
351345

352346
if (populatedProperties != null && !populatedProperties.equals(this.mappedProperties)) {

0 commit comments

Comments
 (0)