From 950f00a28005ad2860d72aa20e996c22076356d9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 12 Nov 2012 13:12:22 -0800 Subject: [PATCH] Fix Collections import Replace backport Collections class with stock JDK version --- .../web/servlet/mvc/condition/CompositeRequestCondition.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java index 5166ebee09..b7c8e0442a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java @@ -18,6 +18,7 @@ package org.springframework.web.servlet.mvc.condition; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -25,8 +26,6 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import edu.emory.mathcs.backport.java.util.Collections; - /** * Implements the {@link RequestCondition} contract by delegating to multiple * {@code RequestCondition} types and using a logical conjunction (' && ') to