From 7bc5353e07c6a3f6759410e7d3c2acaf82e8ddda Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 6 Mar 2013 11:18:49 -0800 Subject: [PATCH] Do not sort the mvc:resources location attribute Update ResourcesBeanDefinitionParser to use ensure that location attribute values remain in the order that they are specified. The order was inadvertently changed in commit 3838d159f3 due to the use of StringUtils.commaDelimitedListToSet which sorts items. Issue: SPR-10355 --- .../web/servlet/config/ResourcesBeanDefinitionParser.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java index 97df07e544aa..6bfdb9c56f45 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package org.springframework.web.servlet.config; +import java.util.Arrays; import java.util.Map; import org.w3c.dom.Element; @@ -89,7 +90,7 @@ private String registerResourceHandler(ParserContext parserContext, Element elem } ManagedList locations = new ManagedList(); - locations.addAll(StringUtils.commaDelimitedListToSet(locationAttr)); + locations.addAll(Arrays.asList(StringUtils.commaDelimitedListToStringArray(locationAttr))); RootBeanDefinition resourceHandlerDef = new RootBeanDefinition(ResourceHttpRequestHandler.class); resourceHandlerDef.setSource(source);