diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
index b9dc114c1d7..b1bffd96655 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
@@ -53,7 +53,7 @@ public class PropertyComparatorTests {
 	}
 
 	@Test
-	public void testCompoundComparator() {
+	public void testChainedComparators() {
 		Comparator<Dog> c = new PropertyComparator<>("lastName", false, true);
 
 		Dog dog1 = new Dog();
@@ -74,9 +74,10 @@ public class PropertyComparatorTests {
 	}
 
 	@Test
-	public void testCompoundComparatorInvert() {
+	public void testChainedComparatorsReversed() {
 		Comparator<Dog> c = (new PropertyComparator<Dog>("lastName", false, true)).
 				thenComparing(new PropertyComparator<>("firstName", false, true));
+
 		Dog dog1 = new Dog();
 		dog1.setFirstName("macy");
 		dog1.setLastName("grayspots");
@@ -91,7 +92,6 @@ public class PropertyComparatorTests {
 	}
 
 
-	@SuppressWarnings("unused")
 	private static class Dog implements Comparable<Object> {
 
 		private String nickName;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
index 38f6ea59f4d..41035336bed 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
@@ -117,7 +117,9 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
 			con = (Connection) con.unwrap(oracleConClass);
 		}
 		catch (ClassNotFoundException | SQLException ex) {
-			logger.warn("Unable to include synonyms in table metadata lookup - no Oracle Connection: " + ex);
+			if (logger.isWarnEnabled()) {
+				logger.warn("Unable to include synonyms in table metadata lookup - no Oracle Connection: " + ex);
+			}
 			super.initializeWithTableColumnMetaData(databaseMetaData, catalogName, schemaName, tableName);
 			return;
 		}