From 7808996d71603236e3d5c054ff62d3500eb13ec2 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 18 Jul 2014 17:02:45 +0200
Subject: [PATCH] Polishing

---
 .../springframework/test/context/jdbc/MergedSqlConfig.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
index 679a07ae76..93dbcacb82 100644
--- a/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
+++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/MergedSqlConfig.java
@@ -57,9 +57,9 @@ class MergedSqlConfig {
 
 
 	private static <E extends Enum<?>> E getEnum(AnnotationAttributes attributes, String attributeName,
-			E inheritOrOverrideValue, E defaultValue) {
+			E inheritedOrDefaultValue, E defaultValue) {
 		E value = attributes.getEnum(attributeName);
-		if (value == inheritOrOverrideValue) {
+		if (value == inheritedOrDefaultValue) {
 			value = defaultValue;
 		}
 		return value;