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

Polishing

This commit is contained in:
Sam Brannen 2014-07-18 17:02:45 +02:00
parent 829d204663
commit 7808996d71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
View File

@ -57,9 +57,9 @@ class MergedSqlConfig {
private static <E extends Enum<?>> E getEnum(AnnotationAttributes attributes, String attributeName, private static <E extends Enum<?>> E getEnum(AnnotationAttributes attributes, String attributeName,
E inheritOrOverrideValue, E defaultValue) { E inheritedOrDefaultValue, E defaultValue) {
E value = attributes.getEnum(attributeName); E value = attributes.getEnum(attributeName);
if (value == inheritOrOverrideValue) { if (value == inheritedOrDefaultValue) {
value = defaultValue; value = defaultValue;
} }
return value; return value;