root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '5.3.x' 

# Conflicts:
#	build.gradle
This commit is contained in:
Juergen Hoeller 2022-03-16 11:24:24 +01:00
parent 0a1ce75c7c 46363c337b
commit c3aed75b92
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-core/spring-core.gradle
View File

@ -85,7 +85,8 @@ jar {
dependsOn cglibRepackJar dependsOn cglibRepackJar
from(zipTree(cglibRepackJar.archivePath)) { from(zipTree(cglibRepackJar.archivePath)) {
include "org/springframework/cglib/**" include "org/springframework/cglib/**"
exclude "org/springframework/cglib/beans/BeanMap*.class" exclude "org/springframework/cglib/beans/BeanMap.class"
exclude "org/springframework/cglib/beans/BeanMap\$*.class"
exclude "org/springframework/cglib/core/AbstractClassGenerator*.class" exclude "org/springframework/cglib/core/AbstractClassGenerator*.class"
exclude "org/springframework/cglib/core/AsmApi*.class" exclude "org/springframework/cglib/core/AsmApi*.class"
exclude "org/springframework/cglib/core/KeyFactory.class" exclude "org/springframework/cglib/core/KeyFactory.class"

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

@ -341,12 +341,6 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
"Unable to map column '" + column + "' to property '" + pd.getName() + "'", ex); "Unable to map column '" + column + "' to property '" + pd.getName() + "'", ex);
} }
} }
else {
// No PropertyDescriptor found
if (rowNumber == 0 && logger.isDebugEnabled()) {
logger.debug("No property found for column '" + column + "' mapped to field '" + field + "'");
}
}
} }
if (populatedProperties != null && !populatedProperties.equals(this.mappedProperties)) { if (populatedProperties != null && !populatedProperties.equals(this.mappedProperties)) {