From 7f5d6ea3f9ac682b4c73d93bb148f2b906e1acb4 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Sat, 28 Dec 2013 20:48:35 +0100
Subject: [PATCH] Fixed NavigableSet/NavigableMap detection in
 createCollection/createMap

Issue: SPR-11257
---
 .../java/org/springframework/core/CollectionFactory.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
index 1a898cbffa0..998bd813e49 100644
--- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
@@ -50,10 +50,6 @@ import org.springframework.util.MultiValueMap;
  */
 public abstract class CollectionFactory {
 
-	private static Class<?> navigableSetClass = null;
-
-	private static Class<?> navigableMapClass = null;
-
 	private static final Set<Class<?>> approximableCollectionTypes = new HashSet<Class<?>>(10);
 
 	private static final Set<Class<?>> approximableMapTypes = new HashSet<Class<?>>(6);
@@ -137,7 +133,7 @@ public abstract class CollectionFactory {
 			if (List.class.equals(collectionType)) {
 				return new ArrayList<E>(initialCapacity);
 			}
-			else if (SortedSet.class.equals(collectionType) || collectionType.equals(navigableSetClass)) {
+			else if (SortedSet.class.equals(collectionType) || NavigableSet.class.equals(collectionType)) {
 				return new TreeSet<E>();
 			}
 			else if (Set.class.equals(collectionType) || Collection.class.equals(collectionType)) {
@@ -206,7 +202,7 @@ public abstract class CollectionFactory {
 			if (Map.class.equals(mapType)) {
 				return new LinkedHashMap<K, V>(initialCapacity);
 			}
-			else if (SortedMap.class.equals(mapType) || mapType.equals(navigableMapClass)) {
+			else if (SortedMap.class.equals(mapType) || NavigableMap.class.equals(mapType)) {
 				return new TreeMap<K, V>();
 			}
 			else if (MultiValueMap.class.equals(mapType)) {